mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-18 21:28:02 +00:00
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
SVN-Revision: 18454
This commit is contained in:
parent
1f88eb26ac
commit
60a4353fdd
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user