squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

auto merge of #19133 : nodakai/rust/run-make-tests-missing-extracflags, r=alexcrichton

Browse source 
Missing `$(EXTRACFLAGS)` resutled in compile failures.
This commit is contained in:
bors 2014-11-22 14:46:38 +00:00
commit caec7b0414
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/test/run-make/bootstrap-from-c-with-native/Makefile
View file

@ -6,7 +6,7 @@ TARGET_RPATH_DIR:=$(TARGET_RPATH_DIR):$(TMPDIR)
all:
$(RUSTC) lib.rs
$(CC) main.c -o $(call RUN_BINFILE,main) $(call RPATH_LINK_SEARCH,$(HOST_LIB_DIR)) -lboot
$(CC) main.c -o $(call RUN_BINFILE,main) $(call RPATH_LINK_SEARCH,$(HOST_LIB_DIR)) -lboot $(EXTRACFLAGS)
$(call RUN,main)
$(call REMOVE_DYLIBS,boot)
$(call FAIL,main)

2
src/test/run-make/c-link-to-rust-dylib/Makefile
View file

@ -4,7 +4,7 @@ HOST_LIB_DIR=$(TMPDIR)/../../../stage$(RUST_BUILD_STAGE)/lib
all:
$(RUSTC) foo.rs
$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) $(call RPATH_LINK_SEARCH,$(HOST_LIB_DIR)) -Wl,-rpath,$(TMPDIR)
$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) $(call RPATH_LINK_SEARCH,$(HOST_LIB_DIR)) -Wl,-rpath,$(TMPDIR) $(EXTRACFLAGS)
$(call RUN,bar)
$(call REMOVE_DYLIBS,foo)
$(call FAIL,bar)