[openwrt/openwrt] toolchain/wrapper: add missing qstrip to info.mk export

LEDE Commits lede-commits at lists.infradead.org
Mon Jun 23 04:30:18 PDT 2025


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/1ce0eb5bf2b36fa866117fd9ebd6b1a9bce14a0f

commit 1ce0eb5bf2b36fa866117fd9ebd6b1a9bce14a0f
Author: Ondrej Cierny <o.cierny at gmail.com>
AuthorDate: Fri Jun 20 14:43:00 2025 -0700

    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 <o.cierny at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/19192
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 toolchain/wrapper/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/wrapper/Makefile b/toolchain/wrapper/Makefile
index e1f8389b1f..c54170caba 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
 




More information about the lede-commits mailing list