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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32556 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/include/toolchain-build.mk b/include/toolchain-build.mk
index a0bc406..d2fdb02 100644 (file)
--- a/include/toolchain-build.mk
+++ b/include/toolchain-build.mk
@@ -16,3 +16,12 @@ TOOLCHAIN_JOBS?=$(if $(CONFIG_TOOLCHAIN_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS))
 include $(INCLUDE_DIR)/host-build.mk
 
 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

diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 9d12721..c7d21b1 100644 (file)
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -83,6 +83,7 @@ define Host/Install
        $(MAKE) -C $(HOST_BUILD_DIR) \
                prefix=$(TOOLCHAIN_DIR)/initial \
                install
+       $(call FixupLibdir,$(TOOLCHAIN_DIR)/initial)
        $(CP) $(TOOLCHAIN_DIR)/initial/. $(TOOLCHAIN_DIR)/
        $(CP) $(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)-readelf $(REAL_STAGING_DIR_HOST)/bin/readelf
 endef

diff --git a/toolchain/gcc/initial/Makefile b/toolchain/gcc/initial/Makefile
index 3d8ab61..6b0536d 100644 (file)
--- a/toolchain/gcc/initial/Makefile
+++ b/toolchain/gcc/initial/Makefile
@@ -29,6 +29,8 @@ define Host/Install
                cp libgcc.a libgcc_initial.a; \
        )
 
+       $(call FixupLibdir,$(TOOLCHAIN_DIR)/initial)
+
        $(CP) $(TOOLCHAIN_DIR)/initial/. $(TOOLCHAIN_DIR)/
 endef