X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fbinutils;h=2102980a7ce85258f2444d4c93873b2790b19c30;hp=2b92d78db33dda5dcf243e5725eff96ad86f8a0f;hb=a50d04ab1c6a37287afa8e3390dfb2da99236bb2;hpb=e22c79733eaa73eb0a2817473f6ef261f789b508

diff --git a/lfs/binutils b/lfs/binutils
index 2b92d78db..2102980a7 100644
--- 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
   EXTRA_INSTALL = tooldir=/usr
+endif
 else
 ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
@@ -93,16 +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
-#	cd $(DIR_SRC)/binutils-build && make $(MAKETUNING)
-#	cd $(DIR_SRC)/binutils-build && make clean
 endif
-	cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) #$(MAKETUNING)
+	cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING)
 	cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
 ifeq "$(ROOT)" ""
-	cd $(DIR_APP)/binutils-build && cp -v ../$(THISAPP)/include/libiberty.h /usr/include
+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