Skip to content

Commit caec7b0

Browse files
committed
auto merge of #19133 : nodakai/rust/run-make-tests-missing-extracflags, r=alexcrichton
Missing `$(EXTRACFLAGS)` resutled in compile failures.
2 parents 4389ee3 + 102b1a5 commit caec7b0

File tree

2 files changed

+2
-2
lines changed
  • src/test/run-make

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ TARGET_RPATH_DIR:=$(TARGET_RPATH_DIR):$(TMPDIR)
66

77
all:
88
$(RUSTC) lib.rs
9-
$(CC) main.c -o $(call RUN_BINFILE,main) $(call RPATH_LINK_SEARCH,$(HOST_LIB_DIR)) -lboot
9+
$(CC) main.c -o $(call RUN_BINFILE,main) $(call RPATH_LINK_SEARCH,$(HOST_LIB_DIR)) -lboot $(EXTRACFLAGS)
1010
$(call RUN,main)
1111
$(call REMOVE_DYLIBS,boot)
1212
$(call FAIL,main)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ HOST_LIB_DIR=$(TMPDIR)/../../../stage$(RUST_BUILD_STAGE)/lib
44

55
all:
66
$(RUSTC) foo.rs
7-
$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) $(call RPATH_LINK_SEARCH,$(HOST_LIB_DIR)) -Wl,-rpath,$(TMPDIR)
7+
$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) $(call RPATH_LINK_SEARCH,$(HOST_LIB_DIR)) -Wl,-rpath,$(TMPDIR) $(EXTRACFLAGS)
88
$(call RUN,bar)
99
$(call REMOVE_DYLIBS,foo)
1010
$(call FAIL,bar)

0 commit comments

Comments
 (0)