Fix a build problem found while building for arm soft-float

diff --git a/Makefile b/Makefile
index aa209ea5a61f2923a12f391a728b227ab91b9db8..05297fc7995fc8e2a628d3a43e20ae7f800ab7b3 100644 (file)
--- 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 2ee0453e98b4bbff53916d12c89ea99176ef4b34..b8481a5c885a598f5f27277e3674591edfd9f8ae 100644 (file)
--- 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