diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-07-03 07:43:12 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-07-05 12:46:42 -0700 |
| commit | 15b680ae86eefae754c3a348d89207fa100b4ca6 (patch) | |
| tree | e122fdf0d5e946c2769a598568918d9cbe7cac19 /src/test | |
| parent | 41ed455db8cbde3cfff0d72e0ae383c20721b27a (diff) | |
| download | rust-15b680ae86eefae754c3a348d89207fa100b4ca6.tar.gz rust-15b680ae86eefae754c3a348d89207fa100b4ca6.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-make/issue-11908/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
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" |