From a579370995674221e1205e358052a1674e9e7e4f Mon Sep 17 00:00:00 2001 From: Butta Date: Fri, 22 Apr 2022 17:23:22 +0530 Subject: [PATCH] rust: explicitly link against the real LLVM shared library %ci:no-build --- packages/rust/build.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/rust/build.sh b/packages/rust/build.sh index 81a2d5df5..e80cfa034 100644 --- a/packages/rust/build.sh +++ b/packages/rust/build.sh @@ -43,11 +43,10 @@ termux_step_configure() { # for backtrace-sys export CC_x86_64_unknown_linux_gnu=gcc export CFLAGS_x86_64_unknown_linux_gnu="-O2" - export LLVM_VERSION=$(grep ^TERMUX_PKG_VERSION= $TERMUX_PKG_BUILDER_DIR/../libllvm/build.sh | cut -f2 -d=) -TERMUX_PKG_REVISION=1 + export LLVM_MAJOR_VERSION=$(. $TERMUX_SCRIPTDIR/packages/libllvm/build.sh; echo $LLVM_MAJOR_VERSION) unset CC CXX CPP LD CFLAGS CXXFLAGS CPPFLAGS LDFLAGS PKG_CONFIG RANLIB # we can't use -L$PREFIX/lib since it breaks things but we need to link against libLLVM-9.so - ln -sf $PREFIX/lib/libLLVM-$LLVM_VERSION.so $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/ + ln -sf $PREFIX/lib/libLLVM-$LLVM_MAJOR_VERSION.so $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/ # rust checks libs in PREFIX/lib. It then can't find libc.so and libdl.so because rust program doesn't # know where those are. Putting them temporarly in $PREFIX/lib prevents that failure @@ -90,9 +89,9 @@ termux_step_make_install() { rust-installer-version \ manifest-* \ x86_64-unknown-linux-gnu - rm $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/libLLVM-$LLVM_VERSION.so - + rm $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/libLLVM-$LLVM_MAJOR_VERSION.so } + termux_step_post_massage() { rm -f lib/libtinfo.so.6 rm -f lib/libz.so