wrong library name

This commit is contained in:
its-pointless 2020-07-27 18:25:16 +10:00
parent 30bbda67af
commit 0e4246617a

View File

@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=1.45.0
TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/rustc-$TERMUX_PKG_VERSION-src.tar.xz TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/rustc-$TERMUX_PKG_VERSION-src.tar.xz
TERMUX_PKG_SHA256=c436034db42bc0ea7e7f32816ac6555b70d1f76c834407597966dfaf2ec839d6 TERMUX_PKG_SHA256=c436034db42bc0ea7e7f32816ac6555b70d1f76c834407597966dfaf2ec839d6
TERMUX_PKG_DEPENDS="libc++, clang, openssl, lld, zlib, libllvm" TERMUX_PKG_DEPENDS="libc++, clang, openssl, lld, zlib, libllvm"
TERMUX_PKG_REVISION=1 TERMUX_PKG_REVISION=2
termux_step_configure() { termux_step_configure() {
termux_setup_cmake termux_setup_cmake
@ -45,7 +45,7 @@ termux_step_configure() {
export CFLAGS_x86_64_unknown_linux_gnu="-O2" export CFLAGS_x86_64_unknown_linux_gnu="-O2"
unset CC CXX CPP LD CFLAGS CXXFLAGS CPPFLAGS LDFLAGS PKG_CONFIG AR RANLIB unset CC CXX CPP LD CFLAGS CXXFLAGS CPPFLAGS LDFLAGS PKG_CONFIG AR RANLIB
# we can't use -L$PREFIX/lib since it breaks things but we need to link against libLLVM-9.so # 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-10.so $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/ ln -sf $PREFIX/lib/libLLVM-10.0.1.so $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/
# rust checks libs in PREFIX/lib because both host and target are x86_64. It then can't find libc.so and libdl.so because rust program doesn't # rust checks libs in PREFIX/lib because both host and target are x86_64. 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 # know where those are. Putting them temporarly in $PREFIX/lib prevents that failure
@ -88,7 +88,7 @@ termux_step_make_install() {
rust-installer-version \ rust-installer-version \
manifest-* \ manifest-* \
x86_64-unknown-linux-gnu x86_64-unknown-linux-gnu
rm $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/libLLVM-10.so rm $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/libLLVM-10.0.1.so
} }
termux_step_post_massage() { termux_step_post_massage() {