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/erl_print_SUITE_data/Makefile.src | |
| 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/erl_print_SUITE_data/Makefile.src')
| -rw-r--r-- | erts/test/erl_print_SUITE_data/Makefile.src | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/erts/test/erl_print_SUITE_data/Makefile.src b/erts/test/erl_print_SUITE_data/Makefile.src index dec5650416..ebcbb10c15 100644 --- a/erts/test/erl_print_SUITE_data/Makefile.src +++ b/erts/test/erl_print_SUITE_data/Makefile.src @@ -22,6 +22,8 @@ include @erts_lib_include_internal_generated@@[email protected] CC = @CC@ CFLAGS = @ERTS_CFLAGS@ LIBS = @ERTS_LIBS@ +CP=cp +CHMOD=chmod EPTF_CFLAGS = -Wall $(CFLAGS) @DEFS@ -I@erts_lib_include_internal@ -I@erts_lib_include_internal_generated@ EPTF_LIBS = $(LIBS) -L@erts_lib_internal_path@ -lerts_internal@type_marker@ @@ -31,12 +33,18 @@ EPTT_LIBS = -L@erts_lib_internal_path@ -lerts_internal_r@type_marker@ $(ETHR_LIB GCC = .@DS@gccifier -CC"$(CC)" -PROGS = erl_print_tests.@emu_threads@@exe@ +PROGS = erl_print_tests.true@exe@ erl_print_tests.false@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@ erl_print_tests.false@exe@: gccifier@exe@ erl_print_tests.c $(GCC) $(EPTF_CFLAGS) -o erl_print_tests.false@exe@ erl_print_tests.c $(EPTF_LIBS) |