X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=summon-arm-toolchain;h=0fd7a1ac537276c7695608bee38b9af1635f5d48;hb=16cd433d5dddb12fe8aaa741edf3da2c15f777d3;hp=355454761b80a53a0c81cb04971b726e87d296ac;hpb=5b0f38af04c7128438aeace223f6f271a77c7f46;p=fw%2Fcortex-toolchain

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 3554547..0fd7a1a 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -36,6 +36,8 @@ LIBSTM32_EN=0
 LIBOPENSTM32_EN=1
 # Make the gcc default to Cortex-M3
 DEFAULT_TO_CORTEX_M3=0
+# Override automatic detection of cpus to compile on
+CPUS=
 
 ##############################################################################
 # Parsing command line parameters
@@ -73,6 +75,9 @@ while [ $# -gt 0 ]; do
 		DEFAULT_TO_CORTEX_M3=*)
 		DEFAULT_TO_CORTEX_M3=$(echo $1 | sed 's,^DEFAULT_TO_CORTEX_M3=,,')
 		;;
+		CPUS=*)
+		CPUS=$(echo $1 | sed 's,^CPUS=,,')
+		;;
 		*)
 		echo "Unknown parameter: $1"
 		exit 1
@@ -93,6 +98,7 @@ echo "OOCD_EN=$OOCD_EN"
 echo "LIBSTM32_EN=$LIBSTM32_EN"
 echo "LIBOPENSTM32_EN=$LIBOPENSTM32_EN"
 echo "DEFAULT_TO_CORTEX_M3=$DEFAULT_TO_CORTEX_M3"
+echo "CPUS=$CPUS"
 
 ##############################################################################
 # Version and download url settings section
@@ -123,12 +129,18 @@ LIBOPENSTM32=master
 # Flags section
 ##############################################################################
 
-if which getconf > /dev/null; then
-	CPUS=$(getconf _NPROCESSORS_ONLN)
+if [ "x${CPUS}" == "x" ]; then
+	if which getconf > /dev/null; then
+		CPUS=$(getconf _NPROCESSORS_ONLN)
+	else
+		CPUS=1
+	fi
+
+	PARALLEL=-j$((CPUS + 1))
 else
-	CPUS=1
+	PARALLEL=-j${CPUS}
 fi
-PARALLEL=-j$((CPUS + 1))
+
 echo "${CPUS} cpu's detected running make with '${PARALLEL}' flag"
 
 GDBFLAGS=
@@ -203,8 +215,7 @@ esac
 function fetch {
     if [ ! -e ${STAMPS}/$1.fetch ]; then
         log "Downloading $1 sources..."
-        wget -c --no-passive-ftp $2
-        touch ${STAMPS}/$1.fetch
+        wget -c --no-passive-ftp $2 && touch ${STAMPS}/$1.fetch
     fi
 }