From 07884eae943fa3c097c7e5b0d5886357e1239b5f Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 17 Jan 2017 17:31:24 +0100
Subject: [PATCH] Fix arm issue with clang-pie-wrapper

We need to wrap arm-linux-androideabi, not arm-linux-android.

Also, specify armv7a as clang cpu target and not just arm.
---
 build-package.sh          | 22 +++++++++++++---------
 scripts/clang-pie-wrapper |  2 +-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/build-package.sh b/build-package.sh
index 19438c72..162095ea 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -207,7 +207,7 @@ termux_step_setup_variables() {
 	TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/toolchain-${TERMUX_ARCH}-ndk${TERMUX_NDK_VERSION}-api${TERMUX_API_LEVEL}"
 	# Bump the below version if a change is made in toolchain setup to ensure
 	# that everyone gets an updated toolchain:
-	TERMUX_STANDALONE_TOOLCHAIN+="-v6"
+	TERMUX_STANDALONE_TOOLCHAIN+="-v7"
 
 	export TERMUX_TAR="tar"
 	export TERMUX_TOUCH="touch"
@@ -516,14 +516,18 @@ termux_step_setup_toolchain() {
 			--arch $_NDK_ARCHNAME \
 			--install-dir $_TERMUX_TOOLCHAIN_TMPDIR
 
-		local w
-		for w in ${TERMUX_ARCH}-linux-android-clang clang; do
-			cp $TERMUX_SCRIPTDIR/scripts/clang-pie-wrapper $_TERMUX_TOOLCHAIN_TMPDIR/bin/$w
-			sed -i 's/COMPILER/clang38/' $_TERMUX_TOOLCHAIN_TMPDIR/bin/$w
-			sed -i "s/TERMUX_ARCH/$TERMUX_ARCH/" $_TERMUX_TOOLCHAIN_TMPDIR/bin/$w
-			cp $TERMUX_SCRIPTDIR/scripts/clang-pie-wrapper $_TERMUX_TOOLCHAIN_TMPDIR/bin/$w++
-			sed -i 's/COMPILER/clang38++/' $_TERMUX_TOOLCHAIN_TMPDIR/bin/$w++
-			sed -i "s/TERMUX_ARCH/$TERMUX_ARCH/" $_TERMUX_TOOLCHAIN_TMPDIR/bin/$w++
+		local wrapped plusplus CLANG_TARGET=$TERMUX_HOST_PLATFORM
+		if [ $TERMUX_ARCH = arm ]; then CLANG_TARGET=${CLANG_TARGET/arm-/armv7a-}; fi
+		for wrapped in ${TERMUX_HOST_PLATFORM}-clang clang; do
+			for plusplus in "" "++"; do
+				local FILE_TO_REPLACE=$_TERMUX_TOOLCHAIN_TMPDIR/bin/${wrapped}${plusplus}
+				if [ ! -f $FILE_TO_REPLACE ]; then
+					termux_error_exit "No toolchain file to override: $FILE_TO_REPLACE"
+				fi
+				cp $TERMUX_SCRIPTDIR/scripts/clang-pie-wrapper $FILE_TO_REPLACE
+				sed -i "s/COMPILER/clang38$plusplus/" $FILE_TO_REPLACE
+				sed -i "s/CLANG_TARGET/$CLANG_TARGET/" $FILE_TO_REPLACE
+			done
 		done
 
 		if [ "$TERMUX_ARCH" = "arm" ]; then
diff --git a/scripts/clang-pie-wrapper b/scripts/clang-pie-wrapper
index 1fc68f56..d9650249 100755
--- a/scripts/clang-pie-wrapper
+++ b/scripts/clang-pie-wrapper
@@ -25,7 +25,7 @@ arguments=()
 # The ordinary wrapper from a NDK standalone toolchain
 # with "${arguments[@]}" added.
 if [ "$1" != "-cc1" ]; then
-    `dirname $0`/COMPILER -target TERMUX_ARCH-none-linux-android --sysroot `dirname $0`/../sysroot "${arguments[@]}" "$@"
+    `dirname $0`/COMPILER -target CLANG_TARGET --sysroot `dirname $0`/../sysroot "${arguments[@]}" "$@"
 else
     # target/triple already spelled out.
     `dirname $0`/COMPILER "${arguments[@]}" "$@"
-- 
2.11.0