From 69cf09dbbcd3936f64a3f8ed45e89dcf69fb1090 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Mon, 21 May 2018 00:13:54 +0200 Subject: [PATCH] community/rust: fix check error --- community/rust/APKBUILD | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/community/rust/APKBUILD b/community/rust/APKBUILD index 06a8e408dc2..9af90078255 100644 --- a/community/rust/APKBUILD +++ b/community/rust/APKBUILD @@ -128,6 +128,12 @@ build() { check() { 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 # XXX: There's some problem with these tests, we will figure it out later. @@ -138,6 +144,8 @@ check() { msg "Running tests for cargo..." CFG_DISABLE_CROSS_TESTS=1 ./x.py test --no-fail-fast src/tools/cargo + + unset LD_LIBRARY_PATH } package() {