Merge branch 'glibc-update2' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x...

[people/teissler/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index b79e8e8df68bc020a2fc5f4e3237e0bb30f4f4a5..c62e748d003ed5c1ca653f606a2429848ada1a62 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -232,7 +232,7 @@ buildtoolchain() {
     local error=false
     case "${MACHINE}:$(uname -m)" in
         # x86
-        i586:i586|i586:i686)
+        i586:i586|i586:i686|i586:x86_64)
             # These are working.
             ;;
         i586:*)
@@ -251,16 +251,9 @@ buildtoolchain() {
     ${error} && \
         exiterror "Cannot build ${MACHINE} toolchain on $(uname -m). Please use the download if any."
 
-    if [ "$(uname -r | grep ipfire)" ]; then
-        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."
+    local gcc=$(type -p gcc)
+    if [ -z "${gcc}" ]; then
+        exiterror "Could not find GCC. You will need a working build enviroment in order to build the toolchain."
     fi
 
     LOGFILE="$BASEDIR/log/_build.toolchain.log"
@@ -268,7 +261,6 @@ buildtoolchain() {
 
     local ORG_PATH=$PATH
     export PATH="/tools/ccache/bin:/tools/bin:$PATH"
-    lfsmake1 fake-environ              PASS=1
     lfsmake1 ccache                    PASS=1
     lfsmake1 binutils                  PASS=1
     lfsmake1 gcc                       PASS=1
@@ -277,7 +269,6 @@ buildtoolchain() {
     lfsmake1 cleanup-toolchain         PASS=1
     lfsmake1 binutils                  PASS=2
     lfsmake1 gcc                       PASS=2
-    lfsmake1 fake-environ              PASS=2
     lfsmake1 ccache                    PASS=2
     lfsmake1 tcl
     lfsmake1 expect
@@ -299,6 +290,7 @@ buildtoolchain() {
     lfsmake1 sed
     lfsmake1 tar
     lfsmake1 texinfo
+    lfsmake1 fake-environ
     lfsmake1 cleanup-toolchain         PASS=2
     export PATH=$ORG_PATH
 }