From 2394ee58a97cf279ecb55176c5529421e2f32544 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Tue, 11 Nov 2003 01:46:50 +0000
Subject: Fix a build problem found while building for arm soft-float

---
 Makefile         | 10 ++++++++--
 make/binutils.mk |  2 --
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index aa209ea5a..05297fc79 100644
--- a/Makefile
+++ b/Makefile
@@ -31,9 +31,14 @@
 # What sortof target system shall we compile this for?
 ARCH:=i386
 #ARCH:=arm
-#ARCH:=mipsel
 #ARCH:=mips
 #ARCH:=powerpc
+#ARCH:=sh4
+#ARCH:=cris
+#ARCH:=m68k
+#ARCH:=v850
+#ARCH:=sparc
+#ARCH:=sh64
 #ARCH:=whatever
 
 # enable to build a native gcc toolchain with uclibc support
@@ -275,8 +280,9 @@ $(BUILD_DIR):
 $(STAGING_DIR):
 	rm -rf $(STAGING_DIR)
 	mkdir -p $(STAGING_DIR)/lib
-	mkdir -p $(STAGING_DIR)/usr/lib
+	mkdir -p $(STAGING_DIR)/usr
 	mkdir -p $(STAGING_DIR)/include
+	ln -fs ../lib $(STAGING_DIR)/usr/lib
 
 $(TARGET_DIR):
 	rm -rf $(TARGET_DIR)
diff --git a/make/binutils.mk b/make/binutils.mk
index 2ee0453e9..b8481a5c8 100644
--- a/make/binutils.mk
+++ b/make/binutils.mk
@@ -17,13 +17,11 @@ $(BINUTILS_DIR)/.unpacked: $(DL_DIR)/$(BINUTILS_SOURCE)
 	mkdir -p $(DL_DIR)
 	mkdir -p $(STAGING_DIR)
 	mkdir -p $(STAGING_DIR)/lib/gcc-lib
-	mkdir -p $(STAGING_DIR)/usr/lib
 	mkdir -p $(STAGING_DIR)/usr/bin;
 	mkdir -p $(STAGING_DIR)/$(GNU_TARGET_NAME)/
 	(cd $(STAGING_DIR)/$(GNU_TARGET_NAME); ln -fs ../lib)
 	(cd $(STAGING_DIR)/$(GNU_TARGET_NAME); ln -fs ../include)
 	(cd $(STAGING_DIR)/$(GNU_TARGET_NAME); ln -fs ../include sys-include)
-	(cd $(STAGING_DIR)/usr/lib; ln -fs ../../lib/gcc-lib)
 	$(BINUTILS_CAT) $(DL_DIR)/$(BINUTILS_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf -
 	touch $(BINUTILS_DIR)/.unpacked
 
-- 
cgit v1.2.3