From 575762260bbf8ec8d35b547a4551bd61ee401fe0 Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Wed, 11 Sep 2019 00:22:18 +0300 Subject: [PATCH] ndk-multilib: add static libc++ Note: we patched clang to look for libc++_shared instead of libc++. So to have static link mode working properly, we need libc++_shared.a linker script which will link with libc++_static.a and libc++abi.a. --- packages/ndk-multilib/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/ndk-multilib/build.sh b/packages/ndk-multilib/build.sh index ceceeb801..80463b910 100644 --- a/packages/ndk-multilib/build.sh +++ b/packages/ndk-multilib/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://developer.android.com/tools/sdk/ndk/index.html TERMUX_PKG_DESCRIPTION="Multilib binaries for cross-compilation" TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SKIP_SRC_EXTRACT=true TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_NO_STATICSPLIT=true @@ -23,6 +23,8 @@ prepare_libs() { cp $BASEDIR/lib{c,dl,log,m}.so $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib cp $BASEDIR/lib{c,dl,m}.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib + cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/aarch64-linux-android/lib{c++_static,c++abi}.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib + echo 'INPUT(-lc++_static -lc++abi)' > $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib/libc++_shared.a LIBATOMIC=$NDK/toolchains/${NDK_SUFFIX}-*/prebuilt/linux-*/${SUFFIX}/lib if [ $ARCH = "arm64" ] || [ $ARCH = "x86_64" ]; then LIBATOMIC+="64"; fi