diff --git a/src/test/run-make-fulldeps/redundant-libs/Makefile b/src/test/run-make-fulldeps/redundant-libs/Makefile index f756dc16590..9a64f4ed07c 100644 --- a/src/test/run-make-fulldeps/redundant-libs/Makefile +++ b/src/test/run-make-fulldeps/redundant-libs/Makefile @@ -1,4 +1,14 @@ -include ../tools.mk + +# 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 +# only pull in the symbols needed _at that point in time_. If a later library +# depends on additional symbols from the library, they will not have been pulled +# in, and you'll get undefined symbols errors. +# +# So in this example, we need to ensure that rustc keeps the _later_ reference +# to foo, and not the former one. RUSTC_FLAGS = \ -l static=bar \ -l foo \ diff --git a/src/test/run-make-fulldeps/redundant-libs/main.rs b/src/test/run-make-fulldeps/redundant-libs/main.rs index 796534d8116..aeae38f096e 100644 --- a/src/test/run-make-fulldeps/redundant-libs/main.rs +++ b/src/test/run-make-fulldeps/redundant-libs/main.rs @@ -8,15 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// 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 only pull in the symbols needed _at that point in time_. -// If a later library depends on additional symbols from the library, they will not have been -// pulled in, and you'll get undefined symbols errors. -// -// So in this example, we need to ensure that rustc keeps the _later_ reference to foo, and not the -// former one. - extern "C" { fn bar(); fn baz();