Revert mistakenly committed changes.
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Nov 2010 14:37:41 +0000 (15:37 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Nov 2010 14:37:41 +0000 (15:37 +0100)
make.sh
tools/make-functions

diff --git a/make.sh b/make.sh
index 13672542f315e1a8e7231d79b6f2ae1bbcb869a3..2def8ff41cf2e7cf9822b32c1989753dd6d6362b 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -227,10 +227,6 @@ prepareenv() {
 }
 
 buildtoolchain() {
-    if [ "$(uname -m)" = "x86_64" ]; then
-        exiterror "Cannot build toolchain on x86_64. Please use the download."
-    fi
-
     LOGFILE="$BASEDIR/log/_build.toolchain.log"
     export LOGFILE
     ORG_PATH=$PATH
@@ -794,7 +790,7 @@ ipfirepackages() {
 case "$1" in 
 build)
        clear
-       BUILDMACHINE="i686"
+       BUILDMACHINE=`uname -m`
        PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
        #only restore on a clean disk
        if [ ! -f log/cleanup-toolchain-2-tools ]; then
@@ -922,7 +918,7 @@ toolchain)
        prepareenv
        beautify build_stage "Toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
        buildtoolchain
-       BUILDMACHINE="i686"
+       BUILDMACHINE=`uname -m`
        echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
        test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
        cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \
@@ -934,7 +930,7 @@ toolchain)
        stdumount
        ;;
 gettoolchain)
-       BUILDMACHINE="i686"
+       BUILDMACHINE=`uname -m`
        # arbitrary name to be updated in case of new toolchain package upload
        PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE
        if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.gz ]; then
index 7a9e3d392425a2b167318f4e79418276b576f41b..4bf414079fd2a4c33fcb9fc2f817efbf92bc7509 100644 (file)
@@ -363,7 +363,7 @@ lfsmake2() {
        [ $? == 1 ] && return 0
 
        local PKG_TIME_START=`date +%s`
-       linux32 chroot $LFS /tools/bin/env -i   HOME=/root \
+       chroot $LFS /tools/bin/env -i   HOME=/root \
                                                TERM=$TERM PS1='\u:\w\$ ' \
                                                PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
                                                VERSION=$VERSION \
@@ -394,7 +394,7 @@ ipfiremake() {
        [ $? == 1 ] && return 0
 
        local PKG_TIME_START=`date +%s`
-       linux32 chroot $LFS /tools/bin/env -i   HOME=/root \
+       chroot $LFS /tools/bin/env -i   HOME=/root \
                                                TERM=$TERM PS1='\u:\w\$ ' \
                                                PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
                                                VERSION=$VERSION \
@@ -456,7 +456,7 @@ installmake() {
        [ $? == 1 ] && return 0
 
        local PKG_TIME_START=`date +%s`
-       linux32 chroot $LFS /tools/bin/env -i   HOME=/root \
+               chroot $LFS /tools/bin/env -i   HOME=/root \
                                                TERM=$TERM PS1='\u:\w\$ ' \
                                                PATH=/opt/i586-uClibc/i586-linux-uclibc/bin:/opt/i586-uClibc/bin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
                                                VERSION=$VERSION \