From: Christian Marangi Date: Sun, 17 Jul 2022 15:56:36 +0000 (+0200) Subject: scripts: ext-toolchain: add support for info.mk in probe_cc X-Git-Tag: v22.03.1~21 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=65bd63206900c0660ac5eb9465a4ffdacb9e51ec;p=openwrt%2Fstaging%2Fhauke.git scripts: ext-toolchain: add support for info.mk in probe_cc Openwrt generate info.mk that contains the libc type. For probe_cc check if the file exist and parse directly it for LIBC type. Signed-off-by: Christian Marangi (cherry picked from commit 75311977f5ff64b491cb57ac713d75e0e410d786) --- diff --git a/scripts/ext-toolchain.sh b/scripts/ext-toolchain.sh index 1ef3f42c50..1f8eca3076 100755 --- a/scripts/ext-toolchain.sh +++ b/scripts/ext-toolchain.sh @@ -463,6 +463,13 @@ probe_cpp() { } probe_libc() { + if [ -f $TOOLCHAIN/info.mk ]; then + LIBC_TYPE=$(grep LIBC_TYPE $TOOLCHAIN/info.mk | sed 's/LIBC_TYPE=//') + return 0 + fi + + echo "Warning! Can't find info.mk, trying to detect with alternative way." + if [ -z "$LIBC_TYPE" ]; then if test_uclibc; then LIBC_TYPE="uclibc"