[STOPGAP] Revert "ndk-multilib: use the new LLVM major version symlink to install the compiler-rt symlinks instead"
This reverts commit afcea2e15a
.
See https://github.com/termux/termux-packages/issues/10526.
This commit is contained in:
parent
741d729d8d
commit
1fd0615822
|
@ -3,8 +3,7 @@ TERMUX_PKG_DESCRIPTION="Multilib binaries for cross-compilation"
|
||||||
TERMUX_PKG_LICENSE="NCSA"
|
TERMUX_PKG_LICENSE="NCSA"
|
||||||
TERMUX_PKG_MAINTAINER="@termux"
|
TERMUX_PKG_MAINTAINER="@termux"
|
||||||
TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
|
TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
|
||||||
# Bump the revision on any libllvm major version update
|
TERMUX_PKG_REVISION=3
|
||||||
TERMUX_PKG_REVISION=4
|
|
||||||
TERMUX_PKG_SKIP_SRC_EXTRACT=true
|
TERMUX_PKG_SKIP_SRC_EXTRACT=true
|
||||||
TERMUX_PKG_PLATFORM_INDEPENDENT=true
|
TERMUX_PKG_PLATFORM_INDEPENDENT=true
|
||||||
TERMUX_PKG_NO_STATICSPLIT=true
|
TERMUX_PKG_NO_STATICSPLIT=true
|
||||||
|
@ -45,7 +44,7 @@ prepare_libs() {
|
||||||
add_cross_compiler_rt() {
|
add_cross_compiler_rt() {
|
||||||
RT_PREFIX=$NDK/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/*/lib/linux
|
RT_PREFIX=$NDK/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/*/lib/linux
|
||||||
RT_OPT_DIR=$TERMUX_PREFIX/opt/ndk-multilib/cross-compiler-rt
|
RT_OPT_DIR=$TERMUX_PREFIX/opt/ndk-multilib/cross-compiler-rt
|
||||||
LIBLLVM_VERSION=$(. $TERMUX_SCRIPTDIR/packages/libllvm/build.sh; echo $LLVM_MAJOR_VERSION)
|
LIBLLVM_VERSION=$(. $TERMUX_SCRIPTDIR/packages/libllvm/build.sh; echo $TERMUX_PKG_VERSION)
|
||||||
RT_PATH=$TERMUX_PREFIX/lib/clang/$LIBLLVM_VERSION/lib/linux
|
RT_PATH=$TERMUX_PREFIX/lib/clang/$LIBLLVM_VERSION/lib/linux
|
||||||
mkdir -p $TERMUX_PKG_MASSAGEDIR/$RT_OPT_DIR
|
mkdir -p $TERMUX_PKG_MASSAGEDIR/$RT_OPT_DIR
|
||||||
cp $RT_PREFIX/* $TERMUX_PKG_MASSAGEDIR/$RT_OPT_DIR || true
|
cp $RT_PREFIX/* $TERMUX_PKG_MASSAGEDIR/$RT_OPT_DIR || true
|
||||||
|
|
Loading…
Reference in New Issue