From 8027784c3589198d3ba4b9a24b26c361462f1946 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer
Date: Wed, 20 Jun 2007 11:26:36 +0000
Subject: - add full sysroot support for non-ancient toolchains. - start to
 separate usr/lib and lib to match normal system-layout

---
 Makefile | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 63535e182..91333599a 100644
--- a/Makefile
+++ b/Makefile
@@ -83,9 +83,12 @@ endif
 # The preferred type of libs we build for the target
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
 LIBTGTEXT=.a
+#PREFERRED_LIB_FLAGS:=--disable-shared --enable-static
 else
 LIBTGTEXT=.so
+#PREFERRED_LIB_FLAGS:=--disable-static --enable-shared
 endif
+PREFERRED_LIB_FLAGS:=--enable-static --enable-shared
 
 
 #############################################################
@@ -146,12 +149,15 @@ $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR):
 $(STAGING_DIR):
 	@mkdir -p $(STAGING_DIR)/bin
 	@mkdir -p $(STAGING_DIR)/lib
-	@mkdir -p $(STAGING_DIR)/include
-	@mkdir -p $(STAGING_DIR)/usr
-	@mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)
-	@ln -snf ../include $(STAGING_DIR)/usr/include
+ifneq ($(findstring y,$(BR2_GCC_VERSION_3_3_5)$(BR2_GCC_VERSION_3_3_6)$(BR2_GCC_VERSION_3_4_2)$(BR2_GCC_VERSION_3_4_3)$(BR2_GCC_VERSION_3_4_4)$(BR2_GCC_VERSION_3_4_5)$(BR2_GCC_VERSION_3_4_6)),y)
+	@mkdir -p $(STAGING_DIR)/usr/lib
+else
+	@ln -snf . $(STAGING_DIR)/usr
+	@mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)
 	@ln -snf ../lib $(STAGING_DIR)/usr/lib
-	@ln -snf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
+	@ln -snf ../lib $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
+endif
+	@mkdir -p $(STAGING_DIR)/usr/include
 
 $(TARGET_DIR):
 	mkdir -p $(TARGET_DIR)
-- 
cgit v1.2.3-55-g7522