Skip to content

Commit

Permalink
scripts: ext-toolchain: fix wrong prefix in print_config generation
Browse files Browse the repository at this point in the history
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 <[email protected]>
(cherry picked from commit 53c293262fce844c8291ab82e6726a8489d3c57b)
  • Loading branch information
Ansuel committed Dec 4, 2022
1 parent 997ab54 commit 1e764ea
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion scripts/ext-toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1e764ea

Please sign in to comment.