From d4d8aaeac97e539be541b51cb6c4ff796cd83806 Mon Sep 17 00:00:00 2001 From: Tom Yan Date: Mon, 13 May 2019 07:17:36 +0800 Subject: [PATCH] build-package: fix unwind symbols hiding Apparently because libgcc.a is now a linker script, `--exclude-libs libgcc.a` doesn't seem to do a thing. Also hiding symbols from libunwind.a. --- scripts/build/termux_step_setup_toolchain.sh | 2 +- scripts/build/termux_step_start_build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index e9b19c397b..4f1b6c9eba 100644 --- a/scripts/build/termux_step_setup_toolchain.sh +++ b/scripts/build/termux_step_setup_toolchain.sh @@ -110,7 +110,7 @@ termux_step_setup_toolchain() { echo '#!/bin/bash' > $wrap_linker echo -n '$(dirname $0)/' >> $wrap_linker echo -n $linker.real >> $wrap_linker - echo ' --exclude-libs libgcc.a "$@"' >> $wrap_linker + echo ' --exclude-libs libunwind.a --exclude-libs libgcc_real.a "$@"' >> $wrap_linker done fi diff --git a/scripts/build/termux_step_start_build.sh b/scripts/build/termux_step_start_build.sh index 9f90c8c9aa..ff877de00e 100644 --- a/scripts/build/termux_step_start_build.sh +++ b/scripts/build/termux_step_start_build.sh @@ -5,7 +5,7 @@ termux_step_start_build() { TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_COMMON_CACHEDIR/${TERMUX_NDK_VERSION}-${TERMUX_ARCH}-${TERMUX_PKG_API_LEVEL}" # Bump the below version if a change is made in toolchain setup to ensure # that everyone gets an updated toolchain: - TERMUX_STANDALONE_TOOLCHAIN+="-v4" + TERMUX_STANDALONE_TOOLCHAIN+="-v5" if [ -n "${TERMUX_PKG_BLACKLISTED_ARCHES:=""}" ] && [ "$TERMUX_PKG_BLACKLISTED_ARCHES" != "${TERMUX_PKG_BLACKLISTED_ARCHES/$TERMUX_ARCH/}" ]; then echo "Skipping building $TERMUX_PKG_NAME for arch $TERMUX_ARCH"