Merge remote branch 'origin/next' into arm-port

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

diff --git a/lfs/binutils b/lfs/binutils
index b6b2c19b5a731542549c8609b44954c0dd07b98b..e0d039800aff4986938167a26a083225ba23ba10 100644 (file)
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -31,6 +31,9 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+# XXX maybe we can remove that ugly MACHINE= by this
+#unexport MACHINE
+
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
@@ -42,7 +45,7 @@ else
 ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = --prefix=/tools --disable-nls --disable-werror --disable-gprof
-  EXTRA_MAKE = LDFLAGS="-all-static"
+  #EXTRA_MAKE = LDFLAGS="-all-static"
   EXTRA_INSTALL = 
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools2
@@ -52,7 +55,16 @@ else
 endif
 endif
 
-EXTRA_CONFIG += --build=$(BUILDTARGET)
+ifeq "$(MACHINE_TYPE)" "arm"
+       EXTRA_CONFIG += \
+               --host=$(BUILDTARGET) \
+               --build=$(BUILDTARGET) \
+               --target=$(BUILDTARGET) \
+               --with-abi=aapcs-linux \
+               --with-float=soft
+else
+       EXTRA_CONFIG += --build=$(BUILDTARGET)
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -94,22 +106,22 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        @mkdir $(DIR_SRC)/binutils-build
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-configure-1.patch
-       cd $(DIR_SRC)/binutils-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
+       cd $(DIR_SRC)/binutils-build && MACHINE= $(DIR_APP)/configure $(EXTRA_CONFIG)
 ifeq "$(PASS)" "1"
-       cd $(DIR_SRC)/binutils-build && make configure-host
+       cd $(DIR_SRC)/binutils-build && make configure-host MAKEINFO=makeinfo MACHINE=
 endif
-       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) MAKEINFO=makeinfo MACHINE=
+       cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install MAKEINFO=makeinfo MACHINE=
 ifeq "$(ROOT)" ""
        cp -v $(DIR_APP)/include/libiberty.h /usr/include
 else
 ifeq "$(PASS)" "1"
-       cd $(DIR_SRC)/binutils-build && make -C ld clean
-       cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/tools/lib
+       cd $(DIR_SRC)/binutils-build && make -C ld clean MACHINE=
+       cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/tools/lib MACHINE=
        cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new /tools/bin
 else
-       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