domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

toolchain: fix up lib64 symlink to lib before copying the initial prefix dir to avoid errors on copying

Browse Source 
SVN-Revision: 32556
This commit is contained in:
Felix Fietkau
2012-06-30 21:43:59 +00:00
parent e98810dced
commit 59b384dabe
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/toolchain-build.mk
View File

@@ -16,3 +16,12 @@ TOOLCHAIN_JOBS?=$(if $(CONFIG_TOOLCHAIN_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS))
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared
define FixupLibdir
if [ -d $(1)/lib64 -a \! -L $(1)/lib64 ]; then \
mkdir -p $(1)/lib; \
mv $(1)/lib64/* $(1)/lib/; \
rm -rf $(1)/lib64; \
fi
ln -sf lib $(1)/lib64
endef

1
toolchain/binutils/Makefile
View File

@@ -83,6 +83,7 @@ define Host/Install
$(MAKE) -C $(HOST_BUILD_DIR) \ $(MAKE) -C $(HOST_BUILD_DIR) \
prefix=$(TOOLCHAIN_DIR)/initial \ prefix=$(TOOLCHAIN_DIR)/initial \
install install
$(call FixupLibdir,$(TOOLCHAIN_DIR)/initial)
$(CP) $(TOOLCHAIN_DIR)/initial/. $(TOOLCHAIN_DIR)/ $(CP) $(TOOLCHAIN_DIR)/initial/. $(TOOLCHAIN_DIR)/
$(CP) $(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)-readelf $(REAL_STAGING_DIR_HOST)/bin/readelf $(CP) $(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)-readelf $(REAL_STAGING_DIR_HOST)/bin/readelf
endef endef

2
toolchain/gcc/initial/Makefile
View File

@@ -29,6 +29,8 @@ define Host/Install
cp libgcc.a libgcc_initial.a; \ cp libgcc.a libgcc_initial.a; \
) )
$(call FixupLibdir,$(TOOLCHAIN_DIR)/initial)
$(CP) $(TOOLCHAIN_DIR)/initial/. $(TOOLCHAIN_DIR)/ $(CP) $(TOOLCHAIN_DIR)/initial/. $(TOOLCHAIN_DIR)/
endef endef