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

Really use gold by default for aarch64

Browse Source
This commit is contained in:
Fredrik Fornwall 2017-01-19 02:51:17 +01:00
parent 7f5da5d3af
commit c8d1a650a4
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build-package.sh
View File

@ -207,7 +207,7 @@ termux_step_setup_variables() {
TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/toolchain-${TERMUX_ARCH}-ndk${TERMUX_NDK_VERSION}-api${TERMUX_API_LEVEL}" TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/toolchain-${TERMUX_ARCH}-ndk${TERMUX_NDK_VERSION}-api${TERMUX_API_LEVEL}"
# Bump the below version if a change is made in toolchain setup to ensure # Bump the below version if a change is made in toolchain setup to ensure
# that everyone gets an updated toolchain: # that everyone gets an updated toolchain:
TERMUX_STANDALONE_TOOLCHAIN+="-v8" TERMUX_STANDALONE_TOOLCHAIN+="-v9"
export TERMUX_TAR="tar" export TERMUX_TAR="tar"
export TERMUX_TOUCH="touch" export TERMUX_TOUCH="touch"
@ -440,11 +440,6 @@ 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
@ -542,6 +537,8 @@ termux_step_setup_toolchain() {
# Use gold by default to work around https://github.com/android-ndk/ndk/issues/148 # Use gold by default to work around https://github.com/android-ndk/ndk/issues/148
cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld.gold \ cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld.gold \
$_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld $_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld
cp $_TERMUX_TOOLCHAIN_TMPDIR/aarch64-linux-android/bin/ld.gold \
$_TERMUX_TOOLCHAIN_TMPDIR/aarch64-linux-android/bin/ld
fi fi
cd $_TERMUX_TOOLCHAIN_TMPDIR/sysroot cd $_TERMUX_TOOLCHAIN_TMPDIR/sysroot