Browse Source

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.
emacs-27
Tom Yan 6 years ago
committed by Leonid Plyushch
parent
commit
7e60494c16
  1. 2
      scripts/build/termux_step_setup_toolchain.sh
  2. 2
      scripts/build/termux_step_start_build.sh

2
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

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

Loading…
Cancel
Save