do not use the wrapper scripts for exportable toolchains internally. on some systems...

[openwrt/staging/chunkeey.git] / target / toolchain / Makefile

diff --git a/target/toolchain/Makefile b/target/toolchain/Makefile
index e9b452ec7f1fe0c086eedc4b3895252fd71ada91..fa9405f6cc2fa9af77883a204f8dd1d499e517d1 100644 (file)
--- a/target/toolchain/Makefile
+++ b/target/toolchain/Makefile
@@ -26,6 +26,8 @@ EXCLUDE_DIRS:=*/ccache \
 
 all: compile
 
+TOOLCHAIN_PREFIX:=$(TOOLCHAIN_BUILD_DIR)/toolchain-$(ARCH)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)
+
 $(BIN_DIR)/$(TOOLCHAIN_NAME).tar.bz2: clean
        mkdir -p $(TOOLCHAIN_BUILD_DIR)
        $(TAR) -cf - -C $(TOPDIR)/staging_dir/  \
@@ -36,6 +38,14 @@ $(BIN_DIR)/$(TOOLCHAIN_NAME).tar.bz2: clean
        $(CP)  $(TOPDIR)/LICENSE ./files/README.TOOLCHAIN \
                $(TOOLCHAIN_BUILD_DIR)/
 
+       $(CP) ./files/wrapper.sh $(TOOLCHAIN_PREFIX)/usr/bin/$(REAL_GNU_TARGET_NAME)-wrapper.sh
+       chmod +x $(TOOLCHAIN_PREFIX)/usr/bin/$(REAL_GNU_TARGET_NAME)-wrapper.sh
+       (cd $(TOOLCHAIN_PREFIX)/usr/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