X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/c8ab26e50205be7b559b4b3c2941b1bfc84e445f..5e927b658d3f3a2176af1090b92fe7f5aa400912:/packages/ndk-multilib/build.sh

diff --git a/packages/ndk-multilib/build.sh b/packages/ndk-multilib/build.sh
index 4ca728e3..dad5eafb 100644
--- a/packages/ndk-multilib/build.sh
+++ b/packages/ndk-multilib/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://developer.android.com/tools/sdk/ndk/index.html
-TERMUX_SUBPKG_DESCRIPTION="multilib binaries for cross-compilation"
+TERMUX_PKG_DESCRIPTION="Multilib binaries for cross-compilation"
 TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_NO_DEVELSPLIT=yes
 TERMUX_PKG_KEEP_STATIC_LIBRARIES="true"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
@@ -22,7 +22,12 @@ prepare_libs () {
 
 	LIBATOMIC=$NDK/toolchains/${NDK_SUFFIX}-*/prebuilt/linux-*/${SUFFIX}/lib
 	if [ $ARCH = arm64 ]; then LIBATOMIC+="64"; fi
-	cp $LIBATOMIC/libatomic.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib/libatomic.a
+	if [ $ARCH = "arm" ]; then LIBATOMIC+="/armv7-a"; fi
+	cp $LIBATOMIC/libatomic.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib/
+
+	LIBGCC=$NDK/toolchains/${NDK_SUFFIX}-*/prebuilt/linux-*/lib/gcc/${SUFFIX}/4.9.x
+	if [ $ARCH = "arm" ]; then LIBGCC+="/armv7-a"; fi
+	cp $LIBGCC/libgcc.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib/
 }
 
 termux_step_extract_into_massagedir () {