sergiotarxz
/
termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4865 from buttaface/rpath 

termux_step_setup_toolchain.sh: don't add duplicate rpath for on-device builds
This commit is contained in:
Leonid Pliushch 2020-02-02 03:54:07 +02:00 committed by GitHub
parent 1cf2933353 b997c4eafa
commit 7700b5ec44
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/build/termux_step_setup_toolchain.sh
View File

@ -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"