diff options
| author | Christian Marangi <ansuelsmth@gmail.com> | 2022-07-17 17:56:59 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-10-03 17:40:26 +0200 |
| commit | 4ad6925a9e6685ecb1931cd76431d1339f47e8c2 (patch) | |
| tree | c8190ce8a8b770c13caa23fc145f879f979a1c83 | |
| parent | 65bd63206900c0660ac5eb9465a4ffdacb9e51ec (diff) | |
| download | upstream-4ad6925a9e6685ecb1931cd76431d1339f47e8c2.tar.gz upstream-4ad6925a9e6685ecb1931cd76431d1339f47e8c2.tar.bz2 upstream-4ad6925a9e6685ecb1931cd76431d1339f47e8c2.zip | |
scripts: ext-toolchain: add support for musl
Openwrt now supports only glibc and musl. Add support for musl and
rework the libc check to handle the new config flags and correctly
compile package basend on that.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit 7be01fe13b4517e5edb8a4818f437d60144cdcb4)
| -rwxr-xr-x | scripts/ext-toolchain.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/scripts/ext-toolchain.sh b/scripts/ext-toolchain.sh index 1f8eca3076..fe1024c18e 100755 --- a/scripts/ext-toolchain.sh +++ b/scripts/ext-toolchain.sh @@ -369,8 +369,18 @@ print_config() { echo "CONFIG_TOOLCHAIN_PREFIX=\"$prefix\"" >> "$config" echo "CONFIG_TARGET_NAME=\"$target\"" >> "$config" - if [ "$LIBC_TYPE" != glibc ]; then - echo "CONFIG_TOOLCHAIN_LIBC=\"$LIBC_TYPE\"" >> "$config" + if [ -f "$config" ]; then + sed -i '/CONFIG_EXTERNAL_TOOLCHAIN_LIBC_USE_MUSL/d' "$config" + sed -i '/CONFIG_EXTERNAL_TOOLCHAIN_LIBC_USE_GLIBC/d' "$config" + fi + + if [ "$LIBC_TYPE" == glibc ]; then + echo "CONFIG_EXTERNAL_TOOLCHAIN_LIBC_USE_GLIBC=y" >> "$config" + elif [ "$LIBC_TYPE" == musl ]; then + echo "CONFIG_EXTERNAL_TOOLCHAIN_LIBC_USE_MUSL=y" >> "$config" + else + echo "Can't detect LIBC type. Aborting!" >&2 + return 1 fi local lib |