From 32d99efa403a5c3ba93d3389110cd9f4226591d2 Mon Sep 17 00:00:00 2001 From: Douglas Creager Date: Tue, 19 Mar 2019 14:53:19 -0400 Subject: [PATCH] Ignore test on Windows --- src/test/run-make-fulldeps/redundant-libs/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/run-make-fulldeps/redundant-libs/Makefile b/src/test/run-make-fulldeps/redundant-libs/Makefile index 25643e50df69..9486e07d21bf 100644 --- a/src/test/run-make-fulldeps/redundant-libs/Makefile +++ b/src/test/run-make-fulldeps/redundant-libs/Makefile @@ -1,5 +1,9 @@ -include ../tools.mk +ifdef IS_WINDOWS +all: +else + # rustc will remove one of the two redundant references to foo below. Depending # on which one gets removed, we'll get a linker error on SOME platforms (like # Linux). On these platforms, when a library is referenced, the linker will @@ -10,7 +14,6 @@ # So in this example, we need to ensure that rustc keeps the _later_ reference # to foo, and not the former one. RUSTC_FLAGS = \ - -C prefer-dynamic \ -l static=bar \ -l foo \ -l static=baz \ @@ -20,3 +23,5 @@ RUSTC_FLAGS = \ all: $(call DYLIB,foo) $(call STATICLIB,bar) $(call STATICLIB,baz) $(RUSTC) $(RUSTC_FLAGS) main.rs $(call RUN,main) + +endif