Fix full-toolchain build on fedora14.
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 10 May 2011 12:31:37 +0000 (14:31 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 10 May 2011 12:31:37 +0000 (14:31 +0200)
lfs/binutils
lfs/make
make.sh

index 25145cc..464ac52 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -54,7 +54,7 @@ endif
 else
 ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
-  EXTRA_CONFIG = --prefix=/tools --disable-nls --disable-werror
+  EXTRA_CONFIG = --prefix=/tools --disable-nls --disable-werror --disable-gprof
   EXTRA_MAKE = LDFLAGS="-all-static"
   EXTRA_INSTALL = 
 else
index 3a3c18a..ba34283 100644 (file)
--- a/lfs/make
+++ b/lfs/make
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -43,7 +43,7 @@ ifeq "$(ROOT)" ""
   EXTRA_MAKE =
   EXTRA_INSTALL =
 else
-  TARGET = $(DIR_INFO)/$(THISAPP)-tools
+  TARGET = $(DIR_INFO)/$(THISAPP)-tools-pass$(PASS)
   EXTRA_CONFIG = --prefix=/tools --disable-nls
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
diff --git a/make.sh b/make.sh
index f572b93..2de4d2d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -247,6 +247,7 @@ buildtoolchain() {
     NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}`
     export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1}
     lfsmake1 ccache    PASS=1
+    lfsmake1 make      PASS=1
     lfsmake1 binutils  PASS=1
     lfsmake1 gcc               PASS=1
     export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH
@@ -270,7 +271,7 @@ buildtoolchain() {
     lfsmake1 grep
     lfsmake1 gzip
     lfsmake1 m4
-    lfsmake1 make
+    lfsmake1 make      PASS=2
     lfsmake1 patch
     lfsmake1 perl
     lfsmake1 sed