Merge branch 'master' into kernel-4.9

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

diff --git a/lfs/binutils b/lfs/binutils
index 7f5ef79ec508c83cf102f08ca2b72954ed0010a3..79ac96b3e20f7d57abed3785398ed675de4ff8b8 100644 (file)
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2017  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -38,20 +38,24 @@ ifeq "$(ROOT)" ""
   EXTRA_CONFIG = \
        --prefix=/usr \
        --enable-shared \
-       --disable-nls \
-       --disable-werror
+       --with-system-zlib \
+       --enable-plugins \
+       --enable-ld=default \
+       --disable-gold
   EXTRA_MAKE = tooldir=/usr
   EXTRA_INSTALL = tooldir=/usr
 else
 ifeq "$(PASS)" "1"
+  CFLAGS := $(patsubst -march=%,,$(CFLAGS))
+  CFLAGS := $(patsubst -mfpu=%,,$(CFLAGS))
+  CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
+
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = \
        --target=$(CROSSTARGET) \
        --prefix=/tools \
        --with-sysroot=$(ROOT) \
-       --with-lib-path=/tools/lib \
-       --disable-nls \
-       --disable-werror
+       --with-lib-path=/tools/lib
   EXTRA_MAKE =
   EXTRA_INSTALL = 
 else
@@ -64,21 +68,20 @@ else
        --host=$(BUILDTARGET) \
        --build=$(BUILDTARGET) \
        --prefix=/tools \
-       --with-lib-path=/tools/lib \
-       --disable-nls \
-       --disable-werror
+       --with-lib-path=/tools/lib
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
 endif
 
-ifeq "$(MACHINE)" "armv5tel"
+ifeq "$(BUILD_ARCH)" "armv5tel"
        EXTRA_CONFIG += \
                --with-abi=aapcs-linux \
                --with-float=soft
 endif
 
 EXTRA_CONFIG += \
+       --disable-werror \
        --enable-64-bit-bfd
 
 ###############################################################################
@@ -124,17 +127,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # 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=
+       cd $(DIR_SRC)/binutils-build && $(EXTRA_ENV) $(DIR_APP)/configure $(EXTRA_CONFIG)
+       cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING)
+       cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
 ifeq "$(ROOT)" ""
        cp -v $(DIR_APP)/include/libiberty.h /usr/include
-else
-ifeq "$(PASS)" "2"
-       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
+
+ifeq "$(TOOLCHAIN)" "1"
+ 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 && cp -v ld/ld-new /tools/bin
+ endif
 endif
+
        @rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build
        @$(POSTBUILD)