diff options
| author | Lukas Larsson <[email protected]> | 2012-06-01 10:53:11 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-06-01 10:53:11 +0200 |
| commit | b82c337dfce2d5bc1e435ebaa6060cb982bc5ad6 (patch) | |
| tree | 8407030ca1c7b7649a21030c36275193d066e36c /erts/test/erl_print_SUITE_data/Makefile.src | |
| parent | 3e348c69b6921dd0e2c5b699ccd36d46321c953c (diff) | |
| parent | 50da1658240587622a057afe2db13d7ebcea3813 (diff) | |
| download | otp-b82c337dfce2d5bc1e435ebaa6060cb982bc5ad6.tar.gz otp-b82c337dfce2d5bc1e435ebaa6060cb982bc5ad6.tar.bz2 otp-b82c337dfce2d5bc1e435ebaa6060cb982bc5ad6.zip | |
Merge branch 'lukas/test-cases' into maint
* lukas/test-cases:
Ignore calls to wx* modules if it is undefined
Fix erl_interface testcases
Update gccifier to respect -link option
Extand timetrap for escript tests
Fix compilation issues on windows and Ubuntu 12.04
Ignore common_test bootstrap
Diffstat (limited to 'erts/test/erl_print_SUITE_data/Makefile.src')
| -rw-r--r-- | erts/test/erl_print_SUITE_data/Makefile.src | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/erts/test/erl_print_SUITE_data/Makefile.src b/erts/test/erl_print_SUITE_data/Makefile.src index ebcbb10c15..96d71c7a98 100644 --- a/erts/test/erl_print_SUITE_data/Makefile.src +++ b/erts/test/erl_print_SUITE_data/Makefile.src @@ -20,16 +20,20 @@ include @erts_lib_include_internal_generated@@[email protected] CC = @CC@ -CFLAGS = @ERTS_CFLAGS@ -LIBS = @ERTS_LIBS@ +CFLAGST = @ERTS_CFLAGS@ +LIBST = @ERTS_LIBS@ +CFLAGSF = @CFLAGS@ +LIBSF = @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@ +COMMON_CFLAGS = -Wall @DEFS@ -I@erts_lib_include_internal@ -I@erts_lib_include_internal_generated@ -EPTT_CFLAGS = -DTHREAD_SAFE $(ETHR_DEFS) $(EPTF_CFLAGS) -EPTT_LIBS = -L@erts_lib_internal_path@ -lerts_internal_r@type_marker@ $(ETHR_LIBS) $(LIBS) +EPTF_CFLAGS = $(CFLAGSF) $(COMMON_CFLAGS) +EPTF_LIBS = -L@erts_lib_internal_path@ -lerts_internal@type_marker@ $(LIBSF) + +EPTT_CFLAGS = -DTHREAD_SAFE $(ETHR_DEFS) $(CFLAGST) $(COMMON_CFLAGS) +EPTT_LIBS = -L@erts_lib_internal_path@ -lerts_internal_r@type_marker@ $(ETHR_LIBS) $(LIBST) GCC = .@DS@gccifier -CC"$(CC)" @@ -43,7 +47,7 @@ gccifier@exe@: $(CHMOD) a+x gccifier@exe@ @ELSE@ gccifier@exe@: ..@DS@utils@[email protected] - $(CC) $(CFLAGS) -o gccifier@exe@ ..@DS@utils@[email protected] $(LIBS) + $(CC) $(CFLAGST) -o gccifier@exe@ ..@DS@utils@[email protected] $(LIBST) @ENDIF@ erl_print_tests.false@exe@: gccifier@exe@ erl_print_tests.c |