diff options
| author | bors <bors@rust-lang.org> | 2014-01-24 03:16:31 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-24 03:16:31 -0800 |
| commit | 5675f2813f86ccc6d94251f447661939d9ac3a63 (patch) | |
| tree | a25db3eeeaa784fb685609a1593bf520420d0d16 | |
| parent | 4ce84fa1ded0b347e39f8f0830086f19a9cd720a (diff) | |
| parent | 24c560a69fc0f075dc55aef191ed35e548082f17 (diff) | |
| download | rust-5675f2813f86ccc6d94251f447661939d9ac3a63.tar.gz rust-5675f2813f86ccc6d94251f447661939d9ac3a63.zip | |
auto merge of #11742 : eminence/rust/dylib-test-fix, r=alexcrichton
On my Gentoo Linux machine, the c-dynamic-dylib test is failing, because libcfoo can't be found. bar has a correct rpath for finding libfoo.so, but libfoo.so's rpath doesn't contain the right entries for finding libcfoo. Below is the test failure on my machine. This test pass with this commit: ``` maketest: c-dynamic-dylib ----- /storage/home/achin/devel/rust/src/test/run-make/c-dynamic-dylib/ -------------------- ------ stdout --------------------------------------------- make[1]: Entering directory `/storage/home/achin/devel/rust/src/test/run-make/c-dynamic-dylib' gcc -Wall -Werror -g -fPIC -m64 -L /storage/home/achin/devel/rust/x86_64-unknown-linux-gnu/test/run-make/c-dynamic-dylib -c -o /storage/home/achin/devel/rust/x86_64-unknown-linux-gnu/test/run-make/c-dynamic-dylib/libcfoo.o cfoo.c gcc -Wall -Werror -g -fPIC -m64 -L /storage/home/achin/devel/rust/x86_64-unknown-linux-gnu/test/run-make/c-dynamic-dylib -o /storage/home/achin/devel/rust/x86_64-unknown-linux-gnu/test/run-make/c-dynamic-dylib/libcfoo.so /storage/home/achin/devel/rust/x86_64-unknown-linux-gnu/test/run-make/c-dynamic-dylib/libcfoo.o -shared /storage/home/achin/devel/rust/x86_64-unknown-linux-gnu/stage2/bin/rustc --out-dir /storage/home/achin/devel/rust/x86_64-unknown-linux-gnu/test/run-make/c-dynamic-dylib -L /storage/home/achin/devel/rust/x86_64-unknown-linux-gnu/test/run-make/c-dynamic-dylib foo.rs /storage/home/achin/devel/rust/x86_64-unknown-linux-gnu/stage2/bin/rustc --out-dir /storage/home/achin/devel/rust/x86_64-unknown-linux-gnu/test/run-make/c-dynamic-dylib -L /storage/home/achin/devel/rust/x86_64-unknown-linux-gnu/test/run-make/c-dynamic-dylib bar.rs /storage/home/achin/devel/rust/x86_64-unknown-linux-gnu/test/run-make/c-dynamic-dylib/bar rm /storage/home/achin/devel/rust/x86_64-unknown-linux-gnu/test/run-make/c-dynamic-dylib/libcfoo.o make[1]: Leaving directory `/storage/home/achin/devel/rust/src/test/run-make/c-dynamic-dylib' ------ stderr --------------------------------------------- /storage/home/achin/devel/rust/x86_64-unknown-linux-gnu/test/run-make/c-dynamic-dylib/bar: error while loading shared libraries: libcfoo.so: cannot open shared object file: No such file or directory make[1]: *** [all] Error 127 ------ --------------------------------------------- ```
| -rw-r--r-- | src/test/run-make/c-dynamic-dylib/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/test/run-make/c-dynamic-dylib/Makefile b/src/test/run-make/c-dynamic-dylib/Makefile index 2b2e5d56e92..940797c85c4 100644 --- a/src/test/run-make/c-dynamic-dylib/Makefile +++ b/src/test/run-make/c-dynamic-dylib/Makefile @@ -1,5 +1,10 @@ -include ../tools.mk +# needed so that libfoo can find libcfoo +ifeq ($(shell uname),Linux) +export LD_LIBRARY_PATH := $(TMPDIR) +endif + # This hits an assertion in the linker on older versions of osx apparently ifeq ($(shell uname),Darwin) all: |