about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Neuhaus <zargony@zargony.com>2013-12-22 21:37:33 +0100
committerAndreas Neuhaus <zargony@zargony.com>2013-12-22 21:37:33 +0100
commit5d0fea144181eb8504852b664ff44543a429969e (patch)
treec2b64f27a280dc6763c9777ae07e0282f96d17a2
parent9b1e7db71c3a71c7a9f89f765e9d500c48539bfe (diff)
Use --crate-file-name to find out the library filename in dep-info test
-rw-r--r--src/test/run-make/dep-info/Makefile1
-rw-r--r--src/test/run-make/dep-info/Makefile.foo8
2 files changed, 3 insertions, 6 deletions
diff --git a/src/test/run-make/dep-info/Makefile b/src/test/run-make/dep-info/Makefile
index 535cda4d80b..236fb1e4024 100644
--- a/src/test/run-make/dep-info/Makefile
+++ b/src/test/run-make/dep-info/Makefile
@@ -1,4 +1,5 @@
 -include ../tools.mk
+
 all:
 	$(RUSTC) --dep-info --lib lib.rs
 	sleep 1
diff --git a/src/test/run-make/dep-info/Makefile.foo b/src/test/run-make/dep-info/Makefile.foo
index 3e009828c0c..2a1ce715e28 100644
--- a/src/test/run-make/dep-info/Makefile.foo
+++ b/src/test/run-make/dep-info/Makefile.foo
@@ -1,10 +1,6 @@
-ifeq ($(shell uname),Darwin)
-LIBEXT=dylib
-else
-LIBEXT=so
-endif
+LIB := $(shell $(RUSTC) --crate-file-name --lib lib.rs)
 
-$(TMPDIR)/libfoo-b517899a-0.1.$(LIBEXT):
+$(TMPDIR)/$(LIB):
 	$(RUSTC) --dep-info --lib lib.rs
 	touch $(TMPDIR)/done