diff options
| author | bors <bors@rust-lang.org> | 2014-11-22 14:46:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-11-22 14:46:38 +0000 |
| commit | caec7b0414ae8e6baa3ca4c3b3da4ec01d9091af (patch) | |
| tree | 72f920feab48142088cf0272457d9ff0549ab98a | |
| parent | 4389ee3893c82fc2b6b33eeb5555cc1744f6da4a (diff) | |
| parent | 102b1a5bf1a60eeafb752844e5c98fe5f4e3b992 (diff) | |
| download | rust-caec7b0414ae8e6baa3ca4c3b3da4ec01d9091af.tar.gz rust-caec7b0414ae8e6baa3ca4c3b3da4ec01d9091af.zip | |
auto merge of #19133 : nodakai/rust/run-make-tests-missing-extracflags, r=alexcrichton
Missing `$(EXTRACFLAGS)` resutled in compile failures.
| -rw-r--r-- | src/test/run-make/bootstrap-from-c-with-native/Makefile | 2 | ||||
| -rw-r--r-- | src/test/run-make/c-link-to-rust-dylib/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/run-make/bootstrap-from-c-with-native/Makefile b/src/test/run-make/bootstrap-from-c-with-native/Makefile index c7753a67464..572447097b7 100644 --- a/src/test/run-make/bootstrap-from-c-with-native/Makefile +++ b/src/test/run-make/bootstrap-from-c-with-native/Makefile @@ -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) diff --git a/src/test/run-make/c-link-to-rust-dylib/Makefile b/src/test/run-make/c-link-to-rust-dylib/Makefile index a5b4430ab6a..2a6cc039485 100644 --- a/src/test/run-make/c-link-to-rust-dylib/Makefile +++ b/src/test/run-make/c-link-to-rust-dylib/Makefile @@ -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) |