X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/4c96d3fbe537f6824872822f07e4422003a5f72e..5915e2e2cc5748a38a25c2342ae613455d884393:/packages/libgnustl/build.sh

diff --git a/packages/libgnustl/build.sh b/packages/libgnustl/build.sh
index 10148364..fdd0d9b3 100644
--- a/packages/libgnustl/build.sh
+++ b/packages/libgnustl/build.sh
@@ -1,16 +1,22 @@
 TERMUX_PKG_HOMEPAGE=http://gcc.gnu.org/onlinedocs/libstdc++/
 TERMUX_PKG_DESCRIPTION="The GNU Standard C++ Library (a.k.a. libstdc++-v3), necessary on android since the system libstdc++.so is stripped down"
 TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=4
 
 termux_step_make_install () {
-        LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_ARCH}-linux-android/lib/libgnustl_shared.so
-        if [ $TERMUX_ARCH = arm ]; then
-                LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/arm-linux-androideabi/lib/armv7-a/hard/libgnustl_shared.so
-        fi
+        local LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/libgnustl_shared.so
+	if [ $TERMUX_ARCH = arm ]; then
+		LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/armv7-a/libgnustl_shared.so
+	fi
 
 	cp $LIBFILE $TERMUX_PREFIX/lib/
-	cd $TERMUX_PREFIX/lib/
+}
 
-	ln -s -f libgnustl_shared.so libstdc++.so
+termux_step_post_massage () {
+	# Setup a libgnustl_shared.so in $PREFIX/lib, so that other C++ using packages
+	# links to it. We do however want to avoid installing this, to avoid problems
+	# where e.g. libm.so on some i686 devices links against libstdc++.so, so do
+	# this here in termux_step_post_massage.
+	cd $TERMUX_PREFIX/lib
+	ln -f -s libgnustl_shared.so libstdc++.so
 }