From: Ondrej Cierny Date: Fri, 20 Jun 2025 21:43:00 +0000 (-0700) Subject: toolchain/wrapper: add missing qstrip to info.mk export X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ce0eb5bf2b36fa866117fd9ebd6b1a9bce14a0f;p=thirdparty%2Fopenwrt.git toolchain/wrapper: add missing qstrip to info.mk export When using an external toolchain, the SetToolchainInfo function is missing a qstrip call on GCC_VERSION, which results in quotes making it to the toolchain info.mk file. This leads to a failure to build the libgcc ipk package because the quotes make it to its version and filename. For some reason, it only fails on the first make invocation, but succeeds on subsequent ones on my setup. Fix this issue by adding the qstrip, making it consistent with the internal toolchain approach. Signed-off-by: Ondrej Cierny Link: https://github.com/openwrt/openwrt/pull/19192 Signed-off-by: Robert Marko --- diff --git a/toolchain/wrapper/Makefile b/toolchain/wrapper/Makefile index e1f8389b1f3..c54170caba6 100644 --- a/toolchain/wrapper/Makefile +++ b/toolchain/wrapper/Makefile @@ -42,7 +42,7 @@ define Host/SetToolchainInfo if [ -f $(CONFIG_TOOLCHAIN_ROOT)/info.mk ]; then \ $(CP) $(CONFIG_TOOLCHAIN_ROOT)/info.mk $(TOOLCHAIN_DIR)/; \ else \ - $(SED) 's,GCC_VERSION=.*,GCC_VERSION=$(CONFIG_GCC_VERSION),' $(TOOLCHAIN_DIR)/info.mk; \ + $(SED) 's,GCC_VERSION=.*,GCC_VERSION=$(call qstrip,$(CONFIG_GCC_VERSION)),' $(TOOLCHAIN_DIR)/info.mk; \ fi endef