From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 3 Jul 2015 00:43:24 +0000 (-0400)
Subject: Work around c++ headers path on i686
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/commitdiff_plain/0425eb1e13ffb79f905311ab9fdb496b34f96643?ds=sidebyside

Work around c++ headers path on i686
---

diff --git a/packages/ndk-stl/.build.sh.swp b/packages/ndk-stl/.build.sh.swp
new file mode 100644
index 00000000..80a6b794
Binary files /dev/null and b/packages/ndk-stl/.build.sh.swp differ
diff --git a/packages/ndk-stl/build.sh b/packages/ndk-stl/build.sh
index 0d48332a..452e7295 100644
--- a/packages/ndk-stl/build.sh
+++ b/packages/ndk-stl/build.sh
@@ -15,6 +15,9 @@ 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/* \
+		   $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/bits
 	fi
         # fenv.h is a C++ compatibility header which should be included with the compiler
         rm -Rf $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/{arm-linux-androideabi,tr1,tr2,fenv.h,complex.h}