diff options
| -rw-r--r-- | rules.mk | 1 | ||||
| -rw-r--r-- | toolchain/wrapper/Makefile | 10 |
2 files changed, 11 insertions, 0 deletions
@@ -194,6 +194,7 @@ ifndef DUMP endif else ifeq ($(CONFIG_NATIVE_TOOLCHAIN),) + -include $(TOOLCHAIN_DIR)/info.mk TARGET_CROSS:=$(call qstrip,$(CONFIG_TOOLCHAIN_PREFIX)) TOOLCHAIN_ROOT_DIR:=$(call qstrip,$(CONFIG_TOOLCHAIN_ROOT)) TOOLCHAIN_BIN_DIRS:=$(patsubst ./%,$(TOOLCHAIN_ROOT_DIR)/%,$(call qstrip,$(CONFIG_TOOLCHAIN_BIN_PATH))) diff --git a/toolchain/wrapper/Makefile b/toolchain/wrapper/Makefile index 3398e407c9..e1f8389b1f 100644 --- a/toolchain/wrapper/Makefile +++ b/toolchain/wrapper/Makefile @@ -38,6 +38,14 @@ $$(if $$($(1)), \ endef +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; \ + fi +endef + define Host/Prepare $(call toolchain_test,CONFIG_SOFT_FLOAT,softfloat) $(call toolchain_test,CONFIG_IPV6,ipv6) @@ -53,10 +61,12 @@ endef define Host/Install $(call toolchain_util,--wrap "$(TOOLCHAIN_DIR)/bin") + $(call Host/SetToolchainInfo) endef define Host/Clean rm -rf $(TOOLCHAIN_DIR)/bin + rm -rf $(TOOLCHAIN_DIR)/info.mk endef $(eval $(call HostBuild)) |