mirror of
https://github.com/immortalwrt/immortalwrt.git
synced 2025-08-07 22:06:25 +08:00
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@gmail.com> Link: https://github.com/openwrt/openwrt/pull/19192 Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:

committed by
Robert Marko

parent
2b0b353104
commit
1ce0eb5bf2
@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user