X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/1d678bcef5dc9cb63cd2f0e503a27d7ef90e083a..31e9aad49795c05722bd47324e473066f2a7637c:/build-package.sh

diff --git a/build-package.sh b/build-package.sh
index bb126b1b..d67b0000 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -17,7 +17,7 @@ test -f $HOME/.termuxrc && . $HOME/.termuxrc
 : ${TERMUX_PROCESS_DEB:=""}
 : ${TERMUX_API_LEVEL:="21"}
 : ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="24.0.1"}
-: ${TERMUX_NDK_VERSION:="12"}
+: ${TERMUX_NDK_VERSION:="13"}
 
 # Handle command-line arguments:
 show_usage () {
@@ -578,7 +578,7 @@ 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"
+	_SPECSFLAG=" -specs=$TERMUX_SCRIPTDIR/termux.spec"
 else
 	export AS=${TERMUX_HOST_PLATFORM}-gcc
 	export CC=$TERMUX_HOST_PLATFORM-clang
@@ -599,6 +599,9 @@ 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
+# "-Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags" here in the future
+# - and no longer remove DT_RUNPATH in termux-elf-cleaner.
 
 if [ "$TERMUX_ARCH" = "arm" ]; then
 	CFLAGS+=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"