From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 19 Apr 2017 08:19:33 +0000 (+0100)
Subject: binutils: Drop modifying CFLAGS in PASS=1
X-Git-Tag: v2.19-core112~135
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d512a1f81cabcdd77a9ff9c057a0172cf113f39;p=people%2Fstevee%2Fipfire-2.x.git

binutils: Drop modifying CFLAGS in PASS=1

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/binutils b/lfs/binutils
index 24155a1d76..7f5ef79ec5 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -44,8 +44,6 @@ 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) \
@@ -127,14 +125,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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)
-	cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
+	cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING) MACHINE=
+	cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install MACHINE=
 ifeq "$(ROOT)" ""
 	cp -v $(DIR_APP)/include/libiberty.h /usr/include
 else
 ifeq "$(PASS)" "2"
-	cd $(DIR_SRC)/binutils-build && make -C ld clean
-	cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/usr/lib:/lib
+	cd $(DIR_SRC)/binutils-build && make -C ld clean MACHINE=
+	cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/usr/lib:/lib MACHINE=
 	cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new /tools/bin
 endif
 endif