Skip to content

Commit 5675f28

Browse files
committed
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 ------ --------------------------------------------- ```
2 parents 4ce84fa + 24c560a commit 5675f28

File tree

1 file changed

+5
-0
lines changed
  • src/test/run-make/c-dynamic-dylib

1 file changed

+5
-0
lines changed

src/test/run-make/c-dynamic-dylib/Makefile

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
-include ../tools.mk
22

3+
# needed so that libfoo can find libcfoo
4+
ifeq ($(shell uname),Linux)
5+
export LD_LIBRARY_PATH := $(TMPDIR)
6+
endif
7+
38
# This hits an assertion in the linker on older versions of osx apparently
49
ifeq ($(shell uname),Darwin)
510
all:

0 commit comments

Comments
 (0)