diff options
| author | Douglas Creager <dcreager@dcreager.net> | 2019-03-19 14:53:19 -0400 |
|---|---|---|
| committer | Douglas Creager <dcreager@dcreager.net> | 2019-03-19 14:53:19 -0400 |
| commit | 32d99efa403a5c3ba93d3389110cd9f4226591d2 (patch) | |
| tree | 40547df4a1659e4be29ec1c373f2633f79f35d5f | |
| parent | b58e19db30906212eafb457243d832eebf4630df (diff) | |
| download | rust-32d99efa403a5c3ba93d3389110cd9f4226591d2.tar.gz rust-32d99efa403a5c3ba93d3389110cd9f4226591d2.zip | |
Ignore test on Windows
| -rw-r--r-- | src/test/run-make-fulldeps/redundant-libs/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/test/run-make-fulldeps/redundant-libs/Makefile b/src/test/run-make-fulldeps/redundant-libs/Makefile index 25643e50df6..9486e07d21b 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 |