X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Ftoolchain-build.mk;h=efc35e278933eaa868207d41aa0423c865eb4e15;hb=f5ece7326adfbc115ae66cf958d510532e064cfb;hp=08054ac9c65fba7b43ef1e39178b9dcd84db4f5a;hpb=106a08103f2ecaca75709dc30db7d7ee6b64bb30;p=openwrt%2Fopenwrt.git

diff --git a/include/toolchain-build.mk b/include/toolchain-build.mk
index 08054ac9c6..efc35e2789 100644
--- a/include/toolchain-build.mk
+++ b/include/toolchain-build.mk
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -6,10 +6,21 @@
 #
 
 override CONFIG_AUTOREBUILD=
+override CONFIG_AUTOREMOVE=
 
+REAL_STAGING_DIR_HOST:=$(STAGING_DIR_HOST)
 STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
 BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
 
 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