diff options
| author | Chris Packham <judge.packham@gmail.com> | 2022-05-08 14:01:38 +1200 |
|---|---|---|
| committer | Chris Packham <judge.packham@gmail.com> | 2022-05-10 19:46:53 +1200 |
| commit | 53bbdc74252f68a3800d222dddee69e63b617bf9 (patch) | |
| tree | 0f7e9646702890994c4273c5b5a7761e01410063 /scripts | |
| parent | e8c4d97683a842064357ed20328e8a5693f28e22 (diff) | |
| download | crosstool-ng-53bbdc74252f68a3800d222dddee69e63b617bf9.tar.gz crosstool-ng-53bbdc74252f68a3800d222dddee69e63b617bf9.tar.bz2 crosstool-ng-53bbdc74252f68a3800d222dddee69e63b617bf9.zip | |
Remove obsolete bionic/android support
The bionic libc support was out of date and relied on downloading
binaries from the internet. It was already marked as obsolete. Now that
the 1.25.0 release is out it can be completely removed.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/arch/arm.sh | 1 | ||||
| -rw-r--r-- | scripts/build/libc/bionic.sh | 34 | ||||
| -rw-r--r-- | scripts/functions | 1 |
3 files changed, 0 insertions, 36 deletions
diff --git a/scripts/build/arch/arm.sh b/scripts/build/arch/arm.sh index 01a40bdd..d1902026 100644 --- a/scripts/build/arch/arm.sh +++ b/scripts/build/arch/arm.sh @@ -18,7 +18,6 @@ CT_DoArchTupleValues() { glibc,y) CT_TARGET_SYS=gnueabi;; uClibc-ng,y)CT_TARGET_SYS=uclibc${CT_LIBC_UCLIBC_USE_GNU_SUFFIX:+gnu}eabi;; musl,y) CT_TARGET_SYS=musleabi;; - bionic,y) CT_TARGET_SYS=androideabi;; *,y) CT_TARGET_SYS=eabi;; esac diff --git a/scripts/build/libc/bionic.sh b/scripts/build/libc/bionic.sh deleted file mode 100644 index 0ffd4d8c..00000000 --- a/scripts/build/libc/bionic.sh +++ /dev/null @@ -1,34 +0,0 @@ -# This file adds functions to extract the bionic C library from the Android NDK -# Copyright 2017 Howard Chu -# Licensed under the GPL v2. See COPYING in the root of this package - -# Install Unified headers -bionic_headers() -{ - CT_DoStep INFO "Installing C library headers" - CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/android-ndk/sysroot/usr" "${CT_SYSROOT_DIR}" -} - -bionic_main() -{ - local arch="${CT_ARCH}" - if [ "${CT_ARCH_64}" = "y" ]; then - if [ "${CT_ARCH}" = "x86" ]; then - arch="${arch}_" - fi - arch="${arch}64" - fi - CT_DoStep INFO "Installing C library binaries" - CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/android-ndk/platforms/android-${CT_ANDROID_API}/arch-${arch}/usr" "${CT_SYSROOT_DIR}" - - # NB: Modifying both CT_TARGET_CFLAGS and CT_ALL_TARGET_CFLAGS: the __ANDROID_API__ - # definition needs to be passed into GCC build, or the resulting libstdc++ gets - # miscompiled (attempt to link against it results in unresolved symbols to stdout/...). - # And since __ANDROID_API__ is a user config option, placing it with other user-supplied - # options isn't completely out of character. - # On the other hand, CT_ALL_TARGET_CFLAGS in non-multilib builds is already set and does - # not get recalculated after GCC build, so setting CT_TARGET_CFLAGS is not reflected - # on other libraries/apps, such as gdbserver. - CT_EnvModify CT_TARGET_CFLAGS "${CT_TARGET_CFLAGS} -D__ANDROID_API__=${CT_ANDROID_API}" - CT_EnvModify CT_ALL_TARGET_CFLAGS "${CT_ALL_TARGET_CFLAGS} -D__ANDROID_API__=${CT_ANDROID_API}" -} diff --git a/scripts/functions b/scripts/functions index c6308c66..c2c1493c 100644 --- a/scripts/functions +++ b/scripts/functions @@ -1134,7 +1134,6 @@ CT_DoBuildTargetTuple() glibc) CT_TARGET_SYS=gnu;; uClibc-ng) CT_TARGET_SYS=uclibc;; musl) CT_TARGET_SYS=musl;; - bionic) CT_TARGET_SYS=android;; none|newlib|picolibc) CT_TARGET_SYS=elf;; *) # Keep empty for the libraries like mingw or avr-libc |