community/rust: fix check error

This commit is contained in:
Jakub Jirutka 2018-05-21 00:13:54 +02:00
parent b00a8dd49f
commit 69cf09dbbc

View File

@ -128,6 +128,12 @@ build() {
check() { check() {
cd "$builddir" cd "$builddir"
# At this moment lib/rustlib/$CTARGET/lib does not contain a complete
# copy of the .so libs from lib (they will be copied there during
# `x.py install`). Thus we must set LD_LIBRARY_PATH for tests to work.
# This is related to change-rpath-to-rustlib.patch.
export LD_LIBRARY_PATH="$builddir/build/$CTARGET/stage2/lib"
"$srcdir"/check-rustc "$builddir"/build/$CTARGET/stage2/bin/rustc "$srcdir"/check-rustc "$builddir"/build/$CTARGET/stage2/bin/rustc
# XXX: There's some problem with these tests, we will figure it out later. # XXX: There's some problem with these tests, we will figure it out later.
@ -138,6 +144,8 @@ check() {
msg "Running tests for cargo..." msg "Running tests for cargo..."
CFG_DISABLE_CROSS_TESTS=1 ./x.py test --no-fail-fast src/tools/cargo CFG_DISABLE_CROSS_TESTS=1 ./x.py test --no-fail-fast src/tools/cargo
unset LD_LIBRARY_PATH
} }
package() { package() {