dahdi: Update to 2.6.1.

[ipfire-2.x.git] / lfs / binutils

diff --git a/lfs/binutils b/lfs/binutils
index 104a2a7f89dba3b5623858f0b8ee91c8eb73a1d9..48aee5c3284f9b2f04e816332a2584fabbdc01f9 100644 (file)
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -43,6 +43,7 @@ ifeq "$(ROOT)" ""
   EXTRA_INSTALL = tooldir=/usr
 else
 ifeq "$(PASS)" "1"
+  CFLAGS := $(patsubst -march=%,,$(CFLAGS))
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = \
        --target=$(CROSSTARGET) \
@@ -113,6 +114,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=