From 5d0fea144181eb8504852b664ff44543a429969e Mon Sep 17 00:00:00 2001 From: Andreas Neuhaus Date: Sun, 22 Dec 2013 21:37:33 +0100 Subject: [PATCH] Use --crate-file-name to find out the library filename in dep-info test --- src/test/run-make/dep-info/Makefile | 1 + src/test/run-make/dep-info/Makefile.foo | 8 ++------ 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 535cda4d80b9..236fb1e4024d 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 3e009828c0c4..2a1ce715e280 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