From 6c9d6fcc508ecc5d251bd8d8a8c82294f9d41127 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 11 Aug 2012 14:06:56 -0400
Subject: [PATCH] toolchain: build toolchain on armv6l and armv7l.

fixed build on hostsystems with hw-float works.
---
 lfs/binutils |  1 +
 lfs/gcc      |  6 +++++-
 lfs/make     |  4 ++++
 make.sh      | 12 ++++++++++--
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/lfs/binutils b/lfs/binutils
index 2ff84746e8..073ee23992 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -44,6 +44,7 @@ ifeq "$(ROOT)" ""
 else
 ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
+  CFLAGS =
   EXTRA_CONFIG = --prefix=/tools --disable-nls --disable-werror --disable-gprof
   #EXTRA_MAKE = LDFLAGS="-all-static"
   EXTRA_INSTALL = 
diff --git a/lfs/gcc b/lfs/gcc
index 785b965cf1..7665074c36 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -53,7 +53,7 @@ ifeq "$(PASS)" "1"
 		--disable-nls \
 		--enable-shared \
 		--enable-languages=c \
-		--disable-bootstrap
+		--enable-bootstrap
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 else
@@ -93,6 +93,10 @@ endif
 export XCFLAGS = $(CFLAGS)
 export TCFLAGS = $(CFLAGS)
 
+ifeq "$(PASS)" "1"
+  CFLAGS =
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
diff --git a/lfs/make b/lfs/make
index ba34283df3..13968fb509 100644
--- a/lfs/make
+++ b/lfs/make
@@ -49,6 +49,10 @@ else
   EXTRA_INSTALL = 
 endif
 
+ifeq "$(PASS)" "1"
+  CFLAGS =
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
diff --git a/make.sh b/make.sh
index e44c8f0889..7b6f1dc835 100755
--- a/make.sh
+++ b/make.sh
@@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 GIT_TAG=$(git tag | tail -1)					# Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)	# Last commit
-TOOLCHAINVER=3
+TOOLCHAINVER=4
 
 BUILDMACHINE=$MACHINE
     if [ "$MACHINE" = "x86_64" ]; then
@@ -240,7 +240,7 @@ buildtoolchain() {
             ;;
 
         # ARM
-        armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv7l)
+        armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv6l|armv5tel:armv7l)
             # These are working.
             ;;
         armv5tel:*)
@@ -255,6 +255,14 @@ buildtoolchain() {
         exiterror "Cannot build toolchain on ipfire. Please use the download."
     fi
 
+    if [ ! -e /usr/include/asm -o ! -e /usr/include/bits -o ! -e /usr/include/gnu -o ! -e /usr/include/sys ]; then
+        exiterror "Cannot build toolchain without (asm, bits, gnu or sys includes). Please fix or use the download."
+    fi
+
+    if [ ! -e /usr/lib/libc.so ]; then
+        exiterror "Cannot build toolchain without (/usr/lib/libc.so). Please fix or use the download."
+    fi
+
     LOGFILE="$BASEDIR/log/_build.toolchain.log"
     export LOGFILE
     NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}`
-- 
2.39.2