diff options
5 files changed, 9 insertions, 10 deletions
diff --git a/src/test/run-make/c-link-to-rust-dylib/Makefile b/src/test/run-make/c-link-to-rust-dylib/Makefile index 7b2130cd4ed..98e112a3744 100644 --- a/src/test/run-make/c-link-to-rust-dylib/Makefile +++ b/src/test/run-make/c-link-to-rust-dylib/Makefile @@ -7,7 +7,7 @@ all: $(TMPDIR)/$(call BIN,bar) ifdef IS_MSVC $(TMPDIR)/$(call BIN,bar): $(call DYLIB,foo) - $(CC) bar.c $(TMPDIR)/foo.lib $(call OUT_EXE,bar) + $(CC) bar.c $(TMPDIR)/foo.dll.lib $(call OUT_EXE,bar) else $(TMPDIR)/$(call BIN,bar): $(call DYLIB,foo) $(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) -L $(TMPDIR) diff --git a/src/test/run-make/c-link-to-rust-staticlib/Makefile b/src/test/run-make/c-link-to-rust-staticlib/Makefile index 3d44b3c256e..47264e82165 100644 --- a/src/test/run-make/c-link-to-rust-staticlib/Makefile +++ b/src/test/run-make/c-link-to-rust-staticlib/Makefile @@ -4,11 +4,10 @@ ifneq ($(shell uname),FreeBSD) all: $(RUSTC) foo.rs - cp $(TMPDIR)/libfoo.a $(call NATIVE_STATICLIB,foo2) - $(CC) bar.c $(call NATIVE_STATICLIB,foo2) $(call OUT_EXE,bar) \ + $(CC) bar.c $(call STATICLIB,foo) $(call OUT_EXE,bar) \ $(EXTRACFLAGS) $(EXTRACXXFLAGS) $(call RUN,bar) - rm $(call STATICLIB,foo*) + rm $(call STATICLIB,foo) $(call RUN,bar) else diff --git a/src/test/run-make/lto-smoke-c/Makefile b/src/test/run-make/lto-smoke-c/Makefile index 72c161abe91..0f61f5de938 100644 --- a/src/test/run-make/lto-smoke-c/Makefile +++ b/src/test/run-make/lto-smoke-c/Makefile @@ -5,7 +5,7 @@ CC := $(CC:-g=) all: $(RUSTC) foo.rs -C lto - $(CC) bar.c $(TMPDIR)/libfoo.a \ + $(CC) bar.c $(call STATICLIB,foo) \ $(call OUT_EXE,bar) \ $(EXTRACFLAGS) $(EXTRACXXFLAGS) $(call RUN,bar) diff --git a/src/test/run-make/output-type-permutations/Makefile b/src/test/run-make/output-type-permutations/Makefile index 6cfa7043a2e..c2715027bc1 100644 --- a/src/test/run-make/output-type-permutations/Makefile +++ b/src/test/run-make/output-type-permutations/Makefile @@ -4,8 +4,8 @@ all: $(RUSTC) foo.rs --crate-type=rlib,dylib,staticlib $(call REMOVE_RLIBS,bar) $(call REMOVE_DYLIBS,bar) - rm $(TMPDIR)/libbar.a - rm -f $(TMPDIR)/bar.{exp,lib,pdb} + rm $(call STATICLIB,bar) + rm -f $(TMPDIR)/bar.{dll.exp,dll.lib,pdb} # Check that $(TMPDIR) is empty. [ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ] @@ -78,7 +78,7 @@ all: rm $(TMPDIR)/$(call BIN,foo) $(RUSTC) foo.rs --crate-type=dylib --emit=link=$(TMPDIR)/$(call BIN,foo) rm $(TMPDIR)/$(call BIN,foo) - rm -f $(TMPDIR)/foo.{exp,lib,pdb} + rm -f $(TMPDIR)/foo.{dll.exp,dll.lib,pdb} [ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ] $(RUSTC) foo.rs --crate-type=staticlib -o $(TMPDIR)/foo @@ -133,7 +133,7 @@ all: rm $(TMPDIR)/bar.ll rm $(TMPDIR)/bar.s rm $(TMPDIR)/bar.o - rm $(TMPDIR)/libbar.a + rm $(call STATICLIB,bar) mv $(TMPDIR)/bar.bc $(TMPDIR)/foo.bc # Don't check that the $(TMPDIR) is empty - we left `foo.bc` for later # comparison. diff --git a/src/test/run-make/static-dylib-by-default/Makefile b/src/test/run-make/static-dylib-by-default/Makefile index 8bd05dc201f..6409aa66ae0 100644 --- a/src/test/run-make/static-dylib-by-default/Makefile +++ b/src/test/run-make/static-dylib-by-default/Makefile @@ -2,7 +2,7 @@ TO_LINK := $(call DYLIB,bar) ifdef IS_MSVC -LINK_ARG = $(TO_LINK:dll=lib) +LINK_ARG = $(TO_LINK:dll=dll.lib) else LINK_ARG = $(TO_LINK) endif |