X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=summon-arm-toolchain.git;a=blobdiff_plain;f=summon-arm-toolchain;h=77bf6d84bb526b7614de2928beeae06364e6d961;hp=f08581a9443af3a78ece3c00584bb9a32b51048c;hb=HEAD;hpb=0b4548cb9d693a16944cc3d71418b612b172fe35

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index f08581a..77bf6d8 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -51,18 +51,18 @@ else
 	GCCURL=http://launchpad.net/gcc-linaro/4.6/${GCCRELEASE}/+download/gcc-linaro-${GCCRELEASE}.tar.bz2
 fi
 
-BINUTILS=binutils-2.21
+BINUTILS=binutils-2.21.1
 NEWLIB=newlib-1.19.0
-GDB=gdb-7.3
+GDB=gdb-7.3.1
 GMP=gmp-5.0.2
 MPFR=mpfr-3.0.1
 MPC=mpc-0.9
 
-SHA1SUMS="ef93235588eb443e4c4a77f229a8d131bccaecc6  binutils-2.21.tar.bz2
+SHA1SUMS="525255ca6874b872540c9967a1d26acfbc7c8230  binutils-2.21.1.tar.bz2
 8bf66f7a71534ba564563a0ba0b2517aead8ac30  gcc-4.6.1.tar.bz2
 9b766705f051ffb7321de58f247688b0ae661b98  gcc-core-4.6.1.tar.bz2
 828d99a63e0578879150f5681d234763cff69313  gcc-linaro-4.6-2011.07.tar.bz2
-fefd90275d6decdca00c5c29c533e2ef3d439664  gdb-7.3.tar.bz2
+e57f2c7f93536ef54fab728eb733bf2c36550718  gdb-7.3.1.tar.bz2
 2968220e1988eabb61f921d11e5d2db5431e0a35  gmp-5.0.2.tar.bz2
 229722d553030734d49731844abfef7617b64f1a  mpc-0.9.tar.gz
 fbf402fc196724ae60ef01eb6ca8490b1ea4db69  mpfr-3.0.1.tar.bz2
@@ -72,9 +72,9 @@ b2269d30ce7b93b7c714b90ef2f40221c2df0fcd  newlib-1.19.0.tar.gz"
 # Flags section
 ##############################################################################
 
-if which getconf > /dev/null && getconf _NPROCESSORS_ONLN > /dev/null; then
+if which getconf > /dev/null 2> /dev/null && getconf _NPROCESSORS_ONLN > /dev/null 2> /dev/null; then
 	CPUS=$(getconf _NPROCESSORS_ONLN)
-elif which sysctl > /dev/null && sysctl hw.ncpu > /dev/null; then
+elif which sysctl > /dev/null 2> /dev/null && sysctl hw.ncpu 2> /dev/null > /dev/null; then
   CPUS=$(sysctl hw.ncpu | sed -E -e 's/^hw\.ncpu(: | = )//')
 else
 	CPUS=1
@@ -141,6 +141,16 @@ else
     TAR=tar     # use the system tar
 fi
 
+if [ -z ${MAKE} ]; then
+    if which gnumake > /dev/null; then
+        export MAKE=gnumake
+    elif which gmake > /dev/null; then
+        export MAKE=gmake
+    else
+        export MAKE=make    # should be GNU make
+    fi
+fi
+
 ##############################################################################
 # Building section
 # You probably don't have to touch anything after this
@@ -188,7 +198,7 @@ unpack() {
 # Install a build
 doinstall() {
     log $1
-    ${SUDO} make ${MAKESILENT} $2 $3 $4 $5 $6 $7 $8
+    ${SUDO} ${MAKE} ${MAKESILENT} $2 $3 $4 $5 $6 $7 $8
 }
 
 if [ ! -d $SUMMON_DIR ]; then
@@ -237,7 +247,7 @@ if [ ! -e ${STAMPS}/${BINUTILS}.build ]; then
                            --disable-werror \
 			   ${BINUTILFLAGS}
     log "Building ${BINUTILS}"
-    make ${MAKEFLAGS}
+    ${MAKE} ${MAKEFLAGS}
     doinstall ${BINUTILS} install
     cd ..
     log "Cleaning up ${BINUTILS}"
@@ -270,7 +280,7 @@ if [ ! -e ${STAMPS}/${GCC}-boot.build ]; then
 		      --with-system-zlib \
 		      ${GCCFLAGS}
     log "Building ${GCC}-boot"
-    make ${MAKEFLAGS} all-gcc
+    ${MAKE} ${MAKEFLAGS} all-gcc
     doinstall ${GCC}-boot install-gcc
     cd ..
     log "Cleaning up ${GCC}-boot"
@@ -299,7 +309,7 @@ if [ ! -e ${STAMPS}/${NEWLIB}.build ]; then
 			 --with-float=soft
     log "Building ${NEWLIB}"
     NEWLIB_FLAGS="-ffunction-sections -fdata-sections -DPREFER_SIZE_OVER_SPEED -D__OPTIMIZE_SIZE__ -Os -fomit-frame-pointer -fno-unroll-loops -D__BUFSIZ__=256 -mabi=aapcs"
-    make ${MAKEFLAGS} CFLAGS_FOR_TARGET="${NEWLIB_FLAGS}" CCASFLAGS="${NEWLIB_FLAGS}"
+    ${MAKE} ${MAKEFLAGS} CFLAGS_FOR_TARGET="${NEWLIB_FLAGS}" CCASFLAGS="${NEWLIB_FLAGS}"
     doinstall ${NEWLIB} install
     cd ..
     log "Cleaning up ${NEWLIB}"
@@ -332,7 +342,7 @@ if [ ! -e ${STAMPS}/${GCC}.build ]; then
                       --with-system-zlib \
 	 	     ${GCCFLAGS}
     log "Building ${GCC}"
-    make ${MAKEFLAGS}
+    ${MAKE} ${MAKEFLAGS}
     doinstall ${GCC} install
     cd ..
     log "Cleaning up ${GCC}"
@@ -351,7 +361,7 @@ if [ ! -e ${STAMPS}/${GDB}.build ]; then
                       --disable-werror \
 		      ${GDBFLAGS}
     log "Building ${GDB}"
-    make ${MAKEFLAGS}
+    ${MAKE} ${MAKEFLAGS}
     doinstall ${GDB} install
     cd ..
     log "Cleaning up ${GDB}"