X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Ftoolchain-build.mk;h=35d8c9380ec190e45b48319b9fe75d15ca8c33f7;hb=f3cb1636abeaba5a753d70592d05541ad929daeb;hp=6defe63edf06e79d2b483682cd9ed0fe478fbaab;hpb=affe22dce74e930c35abc094d5c523135b2f0be0;p=oweals%2Fopenwrt.git

diff --git a/include/toolchain-build.mk b/include/toolchain-build.mk
index 6defe63edf..35d8c9380e 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,11 +6,21 @@
 #
 
 override CONFIG_AUTOREBUILD=
+override CONFIG_AUTOREMOVE=
 
-REAL_STAGING_DIR_HOST:=$(STAGING_DIR_HOST)
-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
+HOST_BUILD_PREFIX:=$(TOOLCHAIN_DIR)
 BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
 
 include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/hardening.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