X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fbinutils;h=791483f218a7a6c0881c88a4a4f8a3a157ba24f8;hb=72586f0ff0bad5d1e9f75ab02dfc3e7595b47ded;hp=104a2a7f89dba3b5623858f0b8ee91c8eb73a1d9;hpb=f7b9315ef36af9405529c7d77c23c28a02d9169f;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/binutils b/lfs/binutils
index 104a2a7f8..791483f21 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -43,6 +43,8 @@ ifeq "$(ROOT)" ""
   EXTRA_INSTALL = tooldir=/usr
 else
 ifeq "$(PASS)" "1"
+  CFLAGS := $(patsubst -march=%,,$(CFLAGS))
+  CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = \
 	--target=$(CROSSTARGET) \
@@ -113,6 +115,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	@mkdir $(DIR_SRC)/binutils-build
+
+	# Prevent installing libiberty to lib64.
+	cd $(DIR_APP) && sed -i 's%\(^MULTIOSDIR = \).*%\1 ../lib%' libiberty/Makefile.in
+
 	cd $(DIR_SRC)/binutils-build && $(EXTRA_ENV) MACHINE= $(DIR_APP)/configure $(EXTRA_CONFIG)
 	cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING) MACHINE=
 	cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install MACHINE=