diff options
| author | Lukas Larsson <[email protected]> | 2012-05-03 10:34:05 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-05-03 10:34:05 +0200 |
| commit | b17c18daa8b502fc32fa977a133b590463f68857 (patch) | |
| tree | 8022df877675862b8c089faeea3aa0ec687730a9 /erts/test/ethread_SUITE_data | |
| parent | 7edca403c98cd00f016b6f6ad66d9e5ce36a9b9e (diff) | |
| parent | c5d6ce6a07478c5ac19fdf2df244c4b837888d08 (diff) | |
| download | otp-b17c18daa8b502fc32fa977a133b590463f68857.tar.gz otp-b17c18daa8b502fc32fa977a133b590463f68857.tar.bz2 otp-b17c18daa8b502fc32fa977a133b590463f68857.zip | |
Merge branch 'maint'
* maint:
Fix include issues in when building tests
Fix cross compile of testcases
Update cross build system for tests to work
Diffstat (limited to 'erts/test/ethread_SUITE_data')
| -rw-r--r-- | erts/test/ethread_SUITE_data/Makefile.src | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/erts/test/ethread_SUITE_data/Makefile.src b/erts/test/ethread_SUITE_data/Makefile.src index 132b23344c..f93a31178b 100644 --- a/erts/test/ethread_SUITE_data/Makefile.src +++ b/erts/test/ethread_SUITE_data/Makefile.src @@ -23,6 +23,8 @@ include @erts_lib_include_internal_generated@@DS@erts_internal.mk CC = @CC@ CFLAGS = @ERTS_CFLAGS@ LIBS = @ERTS_LIBS@ +CP=cp +CHMOD=chmod ETHR_T_CFLAGS = -Wall $(ETHR_DEFS) $(CFLAGS) @DEFS@ -I@erts_lib_include_internal@ -I@erts_lib_include_internal_generated@ ETHR_T_LIBS = $(LIBS) -L@erts_lib_internal_path@ $(ETHR_LIBS) $(ERTS_INTERNAL_X_LIBS) @@ -33,8 +35,14 @@ PROGS = ethread_tests@exe@ all: $(PROGS) +@IFEQ@ (@cross@, yes) +gccifier@exe@: + $(CP) ..@DS@utils@[email protected] gccifier@exe@ + $(CHMOD) a+x gccifier@exe@ +@ELSE@ gccifier@exe@: ..@DS@utils@[email protected] $(CC) $(CFLAGS) -o gccifier@exe@ ..@DS@utils@[email protected] $(LIBS) +@ENDIF@ ethread_tests@exe@: gccifier@exe@ ethread_tests.c $(GCC) $(ETHR_T_CFLAGS) -o ethread_tests@exe@ ethread_tests.c -lerts_internal_r $(ETHR_T_LIBS) |