aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-11-19 17:23:31 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-11-19 17:23:31 +0000
commit6e68fac20692f9ea0bbdb1fec60b5b0daa89b654 (patch)
tree7a9ef5e1f82c8682cd1a6e91fd8071af399b6981
parent6c4d9a9575b9bb7af98c2df3a8918138e122cc5d (diff)
downloadmaster-187ad058-6e68fac20692f9ea0bbdb1fec60b5b0daa89b654.tar.gz
master-187ad058-6e68fac20692f9ea0bbdb1fec60b5b0daa89b654.tar.bz2
master-187ad058-6e68fac20692f9ea0bbdb1fec60b5b0daa89b654.zip
do not use the wrapper scripts for exportable toolchains internally. on some systems the wrapper scripts are broken, and their use should be opt-in
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18454 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/toolchain/Makefile10
-rwxr-xr-xtarget/toolchain/files/wrapper.sh (renamed from toolchain/gcc/files/wrapper.sh)0
-rw-r--r--toolchain/gcc/Makefile6
3 files changed, 10 insertions, 6 deletions
diff --git a/target/toolchain/Makefile b/target/toolchain/Makefile
index e9b452ec7f..fa9405f6cc 100644
--- 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
diff --git a/toolchain/gcc/files/wrapper.sh b/target/toolchain/files/wrapper.sh
index 19e1863c27..19e1863c27 100755
--- a/toolchain/gcc/files/wrapper.sh
+++ b/target/toolchain/files/wrapper.sh
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 955248e81d..ea103c4539 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -246,8 +246,6 @@ define Stage2/Install
$(GCC_MAKE) -C $(HOST_BUILD_DIR2) install
# Set up the symlinks to enable lying about target name.
set -e; \
- $(CP) ./files/wrapper.sh $(TOOLCHAIN_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-wrapper.sh
- chmod +x $(TOOLCHAIN_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-wrapper.sh
(cd $(TOOLCHAIN_DIR)/usr; \
ln -sf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \
cd bin; \
@@ -255,10 +253,6 @@ define Stage2/Install
ln -sf $$$${app} \
$(GNU_TARGET_NAME)$$$${app##$(REAL_GNU_TARGET_NAME)}; \
done; \
- 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; \
);
$(if $(CONFIG_EXTRA_TARGET_ARCH),$(call SetupExtraArch))
endef