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.
android-5
Tom Yan
6 years ago
committed by
Leonid Plyushch
No known key found for this signature in database
GPG Key ID: 45F2964132545795
2 changed files with
2 additions and
2 deletions
-
scripts/build/termux_step_setup_toolchain.sh
-
scripts/build/termux_step_start_build.sh
|
|
|
@ -111,7 +111,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 |
|
|
|
|
|
|
|
|
|
|
|
@ -5,7 +5,7 @@ termux_step_start_build() { |
|
|
|
TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_COMMON_CACHEDIR/android5-${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" |
|
|
|
|
