Skip to content

Commit

Permalink
test/run-make: some test cases lacked $(EXTRACFLAGS).
Browse files Browse the repository at this point in the history
Signed-off-by: NODA, Kai <nodakai@gmail.com>
  • Loading branch information
nodakai committed Nov 20, 2014
1 parent 399ff25 commit 102b1a5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/test/run-make/bootstrap-from-c-with-native/Makefile
Expand Up @@ -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 changes: 1 addition & 1 deletion src/test/run-make/c-link-to-rust-dylib/Makefile
Expand Up @@ -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)

5 comments on commit 102b1a5

@bors
Copy link
Contributor

@bors bors commented on 102b1a5 Nov 22, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at nodakai@102b1a5

@bors
Copy link
Contributor

@bors bors commented on 102b1a5 Nov 22, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging nodakai/rust/run-make-tests-missing-extracflags = 102b1a5 into auto

@bors
Copy link
Contributor

@bors bors commented on 102b1a5 Nov 22, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nodakai/rust/run-make-tests-missing-extracflags = 102b1a5 merged ok, testing candidate = caec7b0

@bors
Copy link
Contributor

@bors bors commented on 102b1a5 Nov 22, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 102b1a5 Nov 22, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = caec7b0

Please sign in to comment.