Installer-Toolchain nochmals ueberarbeitet.

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

diff --git a/lfs/binutils b/lfs/binutils
index 408fdafb24a05243cc56a92ec027bd818d6b0f43..2102980a7ce85258f2444d4c93873b2790b19c30 100644 (file)
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -36,10 +36,23 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
+ifeq "$(LFS_PASS)" "install"
+  TARGET = $(DIR_INFO)/$(THISAPP)-install
+  EXTRA_CONFIG = --prefix=/opt/$(MACHINE)-uClibc \
+               --build=$(MACHINE)-pc-linux-gnu \
+               --host=$(MACHINE)-pc-linux-gnu \
+               --target=$(MACHINE)-linux-uclibc \
+               --disable-nls \
+               --enable-multilib \
+               --disable-werror
+  EXTRA_MAKE = all
+  EXTRA_INSTALL = 
+else
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --enable-shared --disable-nls
-  EXTRA_MAKE = tooldir=/usr LD_LIBRARY_PATH=/usr/lib
-  EXTRA_INSTALL = tooldir=/usr LD_LIBRARY_PATH=/usr/lib
+  EXTRA_MAKE = tooldir=/usr
+  EXTRA_INSTALL = tooldir=/usr
+endif
 else
 ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
@@ -93,15 +106,20 @@ $(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
+ifeq "$(LFS_PASS)" "install"
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/binutils-uclibc-conf.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/binutils-uclibc-libtool-conf.patch
+endif
        cd $(DIR_SRC)/binutils-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
 ifeq "$(PASS)" "1"
        cd $(DIR_SRC)/binutils-build && make configure-host
 endif
-       # $(MAKETUNING) stil is disabled here
-       cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) 
+       cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING)
        cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
 ifeq "$(ROOT)" ""
+ifneq "$(LFS_PASS)" "install"
        cp -v $(DIR_APP)/include/libiberty.h /usr/include
+endif
 else
 ifeq "$(PASS)" "1"
        cd $(DIR_SRC)/binutils-build && make -C ld clean