From b997c4eafaacbc5c3dbbdb11bd6470785ce89c34 Mon Sep 17 00:00:00 2001 From: Butta Date: Sun, 2 Feb 2020 01:21:07 +0530 Subject: [PATCH] termux_step_setup_toolchain.sh: don't add duplicate rpath for on-device builds Unlike the NDK clang, the on-device clang has already been patched to add an rpath to the Termux-prefixed library path, so only have the build script add the rpath flag for NDK builds. --- scripts/build/termux_step_setup_toolchain.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index 46518ffcd..928fdab90 100644 --- a/scripts/build/termux_step_setup_toolchain.sh +++ b/scripts/build/termux_step_setup_toolchain.sh @@ -24,6 +24,7 @@ termux_step_setup_toolchain() { if [ $TERMUX_ARCH = arm ]; then CCTERMUX_HOST_PLATFORM=armv7a-linux-androideabi$TERMUX_PKG_API_LEVEL fi + LDFLAGS+=" -Wl,-rpath=$TERMUX_PREFIX/lib" else export CC_FOR_BUILD=$CC # Some build scripts use environment variable 'PKG_CONFIG', so @@ -53,7 +54,7 @@ termux_step_setup_toolchain() { fi # Android 7 started to support DT_RUNPATH (but not DT_RPATH). - LDFLAGS+=" -Wl,-rpath=$TERMUX_PREFIX/lib,--enable-new-dtags" + LDFLAGS+=" -Wl,--enable-new-dtags" # Avoid linking extra (unneeded) libraries. LDFLAGS+=" -Wl,--as-needed"