X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/344b88f958c0b579c5c858f909c757bd927bf63e..4936e5571484956dc669b0929617069a0c90cc4b:/packages/libgnustl/build.sh

diff --git a/packages/libgnustl/build.sh b/packages/libgnustl/build.sh
index 61cab4da..6d2cbad6 100644
--- a/packages/libgnustl/build.sh
+++ b/packages/libgnustl/build.sh
@@ -1,12 +1,14 @@
 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=3
+TERMUX_PKG_BUILD_REVISION=4
 
 termux_step_make_install () {
         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/hard/libgnustl_shared.so
+		LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/armv7-a/libgnustl_shared.so
+	elif [ $TERMUX_ARCH = x86_64 ]; then
+		LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib64/libgnustl_shared.so
 	fi
 
 	cp $LIBFILE $TERMUX_PREFIX/lib/
@@ -18,5 +20,5 @@ termux_step_post_massage () {
 	# 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 -s libgnustl_shared.so libstdc++.so
+	ln -f -s libgnustl_shared.so libstdc++.so
 }