[backfire] toolchain: fix paths after relocation from usr/ (#10876)

[openwrt/svn-archive/archive.git] / target / toolchain / Makefile

diff --git a/target/toolchain/Makefile b/target/toolchain/Makefile
index e9b452ec7f1fe0c086eedc4b3895252fd71ada91..0db18d1ac1bcb12f628272c3b3fcf7d0e761314f 100644 (file)
--- a/target/toolchain/Makefile
+++ b/target/toolchain/Makefile
@@ -16,7 +16,7 @@ override MAKEFLAGS=
 PKG_OS:=$(shell uname -s)
 PKG_CPU:=$(shell uname -m)
 
-TOOLCHAIN_NAME:=OpenWrt-Toolchain-$(BOARD)-for-$(ARCH)-gcc-$(GCCV)_$(LIBC)-$(LIBCV)
+TOOLCHAIN_NAME:=OpenWrt-Toolchain-$(BOARD)-for-$(ARCH)$(ARCH_SUFFIX)-gcc-$(GCCV)$(DIR_SUFFIX)
 TOOLCHAIN_BUILD_DIR:=$(BUILD_DIR)/$(TOOLCHAIN_NAME)
 EXCLUDE_DIRS:=*/ccache \
        */stamp \
@@ -26,16 +26,26 @@ EXCLUDE_DIRS:=*/ccache \
 
 all: compile
 
+TOOLCHAIN_PREFIX:=$(TOOLCHAIN_BUILD_DIR)/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX)
+
 $(BIN_DIR)/$(TOOLCHAIN_NAME).tar.bz2: clean
        mkdir -p $(TOOLCHAIN_BUILD_DIR)
        $(TAR) -cf - -C $(TOPDIR)/staging_dir/  \
               $(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") \
-              toolchain-$(ARCH)_gcc-$(GCCV)_$(LIBC)-$(LIBCV) | \
+              toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX) | \
               $(TAR) -xf - -C $(TOOLCHAIN_BUILD_DIR)
 
        $(CP)  $(TOPDIR)/LICENSE ./files/README.TOOLCHAIN \
                $(TOOLCHAIN_BUILD_DIR)/
 
+       $(CP) ./files/wrapper.sh $(TOOLCHAIN_PREFIX)/bin/$(REAL_GNU_TARGET_NAME)-wrapper.sh
+       chmod +x $(TOOLCHAIN_PREFIX)/bin/$(REAL_GNU_TARGET_NAME)-wrapper.sh
+       (cd $(TOOLCHAIN_PREFIX)/bin; \
+               for app in cc gcc g++ c++ cpp ld as ; do \
+                       [ -f $(REAL_GNU_TARGET_NAME)-$${app} ] && mv $(REAL_GNU_TARGET_NAME)-$${app} $(REAL_GNU_TARGET_NAME)-$${app}.bin ; \
+                       ln -sf $(REAL_GNU_TARGET_NAME)-wrapper.sh $(REAL_GNU_TARGET_NAME)-$${app} ; \
+               done; \
+       )
        echo REVISION:="$(REVISION)" > $(TOOLCHAIN_BUILD_DIR)/version.mk
        find $(TOOLCHAIN_BUILD_DIR) -name .git | $(XARGS) rm -rf
        find $(TOOLCHAIN_BUILD_DIR) -name .svn | $(XARGS) rm -rf