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

Use rpath-link hack on all aarch64 gcc builds

Browse Source
This commit is contained in:
Fredrik Fornwall 2017-01-18 11:44:31 +01:00
parent b7d8db100c
commit 4219525cdf
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build-package.sh
View File

@ -440,6 +440,11 @@ termux_step_setup_toolchain() {
export CXX=$TERMUX_HOST_PLATFORM-g++ export CXX=$TERMUX_HOST_PLATFORM-g++
LDFLAGS+=" -specs=$TERMUX_SCRIPTDIR/termux.spec" LDFLAGS+=" -specs=$TERMUX_SCRIPTDIR/termux.spec"
CFLAGS+=" -specs=$TERMUX_SCRIPTDIR/termux.spec" CFLAGS+=" -specs=$TERMUX_SCRIPTDIR/termux.spec"
if [ $TERMUX_ARCH = aarch64 ]; then
# Currently needed hack.
LDFLAGS+=" -Wl,-rpath-link,$TERMUX_PREFIX/lib"
LDFLAGS+=" -Wl,-rpath-link,$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib"
fi
else else
export AS=${TERMUX_HOST_PLATFORM}-clang export AS=${TERMUX_HOST_PLATFORM}-clang
export CC=$TERMUX_HOST_PLATFORM-clang export CC=$TERMUX_HOST_PLATFORM-clang

6
packages/elfutils/build.sh
View File

@ -16,12 +16,6 @@ termux_step_pre_configure() {
LDFLAGS+=" -lintl" LDFLAGS+=" -lintl"
CFLAGS+=" -DTERMUX_EXPOSE_MEMPCPY=1 -Wno-error=unused-value -Wno-error=format-nonliteral -Wno-error" CFLAGS+=" -DTERMUX_EXPOSE_MEMPCPY=1 -Wno-error=unused-value -Wno-error=format-nonliteral -Wno-error"
if [ $TERMUX_ARCH = aarch64 ]; then
# Currently needed hack.
LDFLAGS+=" -Wl,-rpath-link,$TERMUX_PREFIX/lib"
LDFLAGS+=" -Wl,-rpath-link,$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib"
fi
# Exposes ACCESSPERMS in <sys/stat.h> which elfutils uses: # Exposes ACCESSPERMS in <sys/stat.h> which elfutils uses:
CFLAGS+=" -D__USE_BSD" CFLAGS+=" -D__USE_BSD"