toolchain: build toolchain on armv6l and armv7l.

fixed build on hostsystems with hw-float works.

diff --git a/lfs/binutils b/lfs/binutils
index 2ff84746e88adc10ae3845e739d1b8639c446a84..073ee23992ed014db2a4dba600cffa5fccee8ec1 100644 (file)
--- 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 785b965cf1410a9e3306a03cb11b193615ec4029..7665074c36fb374c64ffd7c9492334b7bab5c2d8 100644 (file)
--- 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 ba34283df3a6efd947e8d69aff89ad0647b03938..13968fb509cac7074d91f551874e06eae8920ef2 100644 (file)
--- 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 e44c8f088910f6e67f00c5eccc8e6ceff3d2e7b8..7b6f1dc83533c4b196aaa0097a9cdb3fc4771497 100755 (executable)
--- 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'}`