aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Marangi <ansuelsmth@gmail.com>2022-07-03 02:20:11 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-10-03 17:40:26 +0200
commit24cf766dfe80721dd033132a90399cb28138a63f (patch)
treee584f899585306a91f0bb784cf922d8a2a341b14
parent18a88668b8ede053919e9ec9b71364cab8e94c57 (diff)
downloadupstream-24cf766dfe80721dd033132a90399cb28138a63f.tar.gz
upstream-24cf766dfe80721dd033132a90399cb28138a63f.tar.bz2
upstream-24cf766dfe80721dd033132a90399cb28138a63f.zip
scripts: ext-toolchain: fix wrong prefix in print_config generation
The parsed prefix in print_config is wrong and this produce broken generated .config that won't work with any external toolchain. Currently the prefix from a CC of 'arm-openwrt-linux-muslgnueabi-gcc-12.1.0' produce a prefix 'arm-openwrt-linux-muslgnueabi-gcc-' This is wrong as the real prefix should be 'arm-openwrt-linux-muslgnueabi-' This is probably caused by a change in how the toolchain is now handled that now append also the gcc version. Probably in ancient days the version wasn't part of the name and the prefix generation stripped the '-gcc' instead of the gcc version. Fix this and correctly strip the gcc version and the gcc suffix to correctly call toolchain bins. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> (cherry picked from commit 53c293262fce844c8291ab82e6726a8489d3c57b)
-rwxr-xr-xscripts/ext-toolchain.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/ext-toolchain.sh b/scripts/ext-toolchain.sh
index 4da287591a..b52f170b32 100755
--- a/scripts/ext-toolchain.sh
+++ b/scripts/ext-toolchain.sh
@@ -281,8 +281,11 @@ print_config() {
local mksubtarget
local target="$("$CC" $CFLAGS -dumpmachine)"
+ local version="$("$CC" $CFLAGS -dumpversion)"
local cpuarch="${target%%-*}"
- local prefix="${CC##*/}"; prefix="${prefix%-*}-"
+
+ # get CC; strip version; strip gcc and add - suffix
+ local prefix="${CC##*/}"; prefix="${prefix%-$version}"; prefix="${prefix%-*}-"
local config="${0%/scripts/*}/.config"
# if no target specified, print choice list and exit