From 15b680ae86eefae754c3a348d89207fa100b4ca6 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 3 Jul 2014 07:43:12 -0700 Subject: Test fixes and rebase conflicts --- src/test/run-make/issue-11908/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/test') diff --git a/src/test/run-make/issue-11908/Makefile b/src/test/run-make/issue-11908/Makefile index 66f360daa1a..663a9f7125e 100644 --- a/src/test/run-make/issue-11908/Makefile +++ b/src/test/run-make/issue-11908/Makefile @@ -10,12 +10,14 @@ all: mkdir $(TMPDIR)/other $(RUSTC) foo.rs --crate-type=dylib - $(RUSTC) foo.rs --crate-type=dylib -o $(TMPDIR)/other/libfoo.so + mv $(call DYLIB,foo) $(TMPDIR)/other + $(RUSTC) foo.rs --crate-type=dylib $(RUSTC) bar.rs -L $(TMPDIR)/other 2>&1 | \ grep "multiple dylib candidates" rm -rf $(TMPDIR) mkdir -p $(TMPDIR)/other $(RUSTC) foo.rs --crate-type=rlib - $(RUSTC) foo.rs --crate-type=rlib -o $(TMPDIR)/other/libfoo.rlib + mv $(TMPDIR)/libfoo.rlib $(TMPDIR)/other + $(RUSTC) foo.rs --crate-type=rlib $(RUSTC) bar.rs -L $(TMPDIR)/other 2>&1 | \ grep "multiple rlib candidates" -- cgit 1.4.1-3-g733a5