From 619b966418ef33cfae399236ac18a07f3df6546c Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 17 Jan 2017 15:51:59 +0100
Subject: [PATCH] build-package.sh: Remove _SPECSFLAG

---
 build-package.sh | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/build-package.sh b/build-package.sh
index 8637f31b..65014b88 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -431,20 +431,22 @@ termux_step_setup_toolchain() {
 	# We put this after system PATH to avoid picking up toolchain stripped python
 	export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin
 
-	export AR=$TERMUX_HOST_PLATFORM-ar
+	export CFLAGS=""
+	export LDFLAGS="-L${TERMUX_PREFIX}/lib"
+
 	if [ "$TERMUX_PKG_CLANG" = "no" ]; then
 		export AS=${TERMUX_HOST_PLATFORM}-gcc
 		export CC=$TERMUX_HOST_PLATFORM-gcc
 		export CXX=$TERMUX_HOST_PLATFORM-g++
-		_SPECSFLAG=" -specs=$TERMUX_SCRIPTDIR/termux.spec"
+		LDFLAGS+=" -specs=$TERMUX_SCRIPTDIR/termux.spec"
+		CFLAGS+=" -specs=$TERMUX_SCRIPTDIR/termux.spec"
 	else
 		export AS=${TERMUX_HOST_PLATFORM}-clang
 		export CC=$TERMUX_HOST_PLATFORM-clang
 		export CXX=$TERMUX_HOST_PLATFORM-clang++
-		# TODO: clang does not have specs file, how to ensure pie
-		# binaries gets built?
-		_SPECSFLAG=""
 	fi
+
+	export AR=$TERMUX_HOST_PLATFORM-ar
 	export CPP=${TERMUX_HOST_PLATFORM}-cpp
 	export CC_FOR_BUILD=gcc
 	export LD=$TERMUX_HOST_PLATFORM-ld
@@ -455,8 +457,6 @@ termux_step_setup_toolchain() {
 	export READELF=$TERMUX_HOST_PLATFORM-readelf
 	export STRIP=$TERMUX_HOST_PLATFORM-strip
 
-	export CFLAGS="$_SPECSFLAG"
-	export LDFLAGS="$_SPECSFLAG -L${TERMUX_PREFIX}/lib"
 	# Android 7 started to support DT_RUNPATH (but not DT_RPATH), so we may want
 	# LDFLAGS+="-Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags"
 	# and no longer remove DT_RUNPATH in termux-elf-cleaner.
@@ -668,12 +668,6 @@ termux_step_configure_autotools () {
 termux_step_configure_cmake () {
 	termux_setup_cmake
 
-	if [ -n "$_SPECSFLAG" ]; then
-		CFLAGS=${CFLAGS#$_SPECSFLAG}
-		CXXFLAGS=${CXXFLAGS#$_SPECSFLAG}
-		LDFLAGS=${LDFLAGS#$_SPECSFLAG}
-	fi
-
 	local TOOLCHAIN_ARGS="-DCMAKE_ANDROID_STANDALONE_TOOLCHAIN=$TERMUX_STANDALONE_TOOLCHAIN"
 	local BUILD_TYPE=MinSizeRel
 	test -n "$TERMUX_DEBUG" && BUILD_TYPE=Debug
-- 
2.11.0