]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
binutils: Drop modifying CFLAGS in PASS=1
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Apr 2017 08:19:33 +0000 (09:19 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 18 May 2017 11:01:41 +0000 (12:01 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/binutils

index 24155a1d760a203173de267bc19713f9fe96c69b..7f5ef79ec508c83cf102f08ca2b72954ed0010a3 100644 (file)
@@ -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