X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=summon-arm-toolchain;h=5706b8135c2fd8e193d6c5f8b61e6da1d3d44a5d;hb=558bb7cc89acf6944592abb57018f9c5d946e776;hp=a20608d906193d4719a20b43bb801784d2d901fc;hpb=83c869ef44037bc2e0abec196de05998d5fea5c9;p=summon-arm-toolchain.git

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index a20608d..5706b81 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -72,8 +72,10 @@ b2269d30ce7b93b7c714b90ef2f40221c2df0fcd  newlib-1.19.0.tar.gz"
 # Flags section
 ##############################################################################
 
-if which getconf > /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 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
 fi
@@ -95,12 +97,13 @@ if [ -f local.sh ]; then
     . ./local.sh
 fi
 
-MAKEFLAGS=${PARALLEL}
+MAKEFLAGS=${PARALLEL} ${MAKESILENT}
 TARFLAGS=v
+MAKESILENT=
 
 if [ ${QUIET} != 0 ]; then
     TARFLAGS=
-    MAKEFLAGS="${MAKEFLAGS} -s"
+    MAKESILENT="-s"
 fi
 
 export PATH="${PREFIX}/bin:${PATH}"
@@ -144,7 +147,7 @@ fi
 ##############################################################################
 
 # Fetch a versioned file from a URL
-fetch() {
+dofetch() {
     if [ ! -e ${STAMPS}/$1.fetch ]; then
         log "Downloading $1 sources..."
         ${FETCHCMD} $2
@@ -185,7 +188,7 @@ unpack() {
 # Install a build
 doinstall() {
     log $1
-    ${SUDO} make ${MAKEFLAGS} $2 $3 $4 $5 $6 $7 $8
+    ${SUDO} make ${MAKESILENT} $2 $3 $4 $5 $6 $7 $8
 }
 
 if [ ! -d $SUMMON_DIR ]; then
@@ -198,13 +201,13 @@ mkdir -p ${STAMPS} ${SOURCES}
 
 cd ${SOURCES}
 
-fetch ${BINUTILS} http://ftp.gnu.org/gnu/binutils/${BINUTILS}.tar.bz2
-fetch ${GCC} ${GCCURL}
-fetch ${NEWLIB} ftp://sources.redhat.com/pub/newlib/${NEWLIB}.tar.gz
-fetch ${GDB} http://ftp.gnu.org/gnu/gdb/${GDB}.tar.bz2
-fetch ${GMP} ftp://ftp.gmplib.org/pub/${GMP}/${GMP}.tar.bz2
-fetch ${MPFR} http://www.mpfr.org/${MPFR}/${MPFR}.tar.bz2
-fetch ${MPC} http://www.multiprecision.org/mpc/download/${MPC}.tar.gz
+dofetch ${BINUTILS} http://ftp.gnu.org/gnu/binutils/${BINUTILS}.tar.bz2
+dofetch ${GCC} ${GCCURL}
+dofetch ${NEWLIB} ftp://sources.redhat.com/pub/newlib/${NEWLIB}.tar.gz
+dofetch ${GDB} http://ftp.gnu.org/gnu/gdb/${GDB}.tar.bz2
+dofetch ${GMP} ftp://ftp.gmplib.org/pub/${GMP}/${GMP}.tar.bz2
+dofetch ${MPFR} http://www.mpfr.org/${MPFR}/${MPFR}.tar.bz2
+dofetch ${MPC} http://www.multiprecision.org/mpc/download/${MPC}.tar.gz
 
 if which sha1sum > /dev/null; then
     for f in ${BINUTILS} ${GCC} ${NEWLIB} ${GDB} ${GMP} ${MPFR} ${MPC}; do