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

[openwrt/svn-archive/archive.git] / include / toolchain-build.mk

diff --git a/include/toolchain-build.mk b/include/toolchain-build.mk
index a0bc4061fcfcfc6c488e30ac985ccf4c709f9d5d..d2fdb0281a104175bb24649703415b30218ddd65 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