Skip to content

Commit 1ce0eb5

Browse files
ciernyrobimarko
authored andcommitted
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 <[email protected]> Link: openwrt/openwrt#19192 Signed-off-by: Robert Marko <[email protected]>
1 parent 2b0b353 commit 1ce0eb5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

toolchain/wrapper/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ define Host/SetToolchainInfo
4242
if [ -f $(CONFIG_TOOLCHAIN_ROOT)/info.mk ]; then \
4343
$(CP) $(CONFIG_TOOLCHAIN_ROOT)/info.mk $(TOOLCHAIN_DIR)/; \
4444
else \
45-
$(SED) 's,GCC_VERSION=.*,GCC_VERSION=$(CONFIG_GCC_VERSION),' $(TOOLCHAIN_DIR)/info.mk; \
45+
$(SED) 's,GCC_VERSION=.*,GCC_VERSION=$(call qstrip,$(CONFIG_GCC_VERSION)),' $(TOOLCHAIN_DIR)/info.mk; \
4646
fi
4747
endef
4848

0 commit comments

Comments
 (0)