From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Wed, 2 Dec 2015 00:59:49 +0000 (-0500)
Subject: ndk-stl: Fix 64-bit builds
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/commitdiff_plain/0ff8e1e7933076b01d373aacefe52b58075bc6ed

ndk-stl: Fix 64-bit builds
---

diff --git a/packages/ndk-stl/build.sh b/packages/ndk-stl/build.sh
index 452e7295..71fcc408 100644
--- a/packages/ndk-stl/build.sh
+++ b/packages/ndk-stl/build.sh
@@ -15,8 +15,8 @@ termux_step_extract_into_massagedir () {
 	if [ $TERMUX_ARCH = arm ]; then
 		cp $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/arm-linux-androideabi/armv7-a/bits/* \
 		   $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/bits
-	elif [ $TERMUX_ARCH = i686 ]; then
-		cp $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/i686-linux-android/bits/* \
+	else
+		cp $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/$TERMUX_ARCH-linux-android/bits/* \
 		   $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/bits
 	fi
         # fenv.h is a C++ compatibility header which should be included with the compiler