Added option to override the automatic CPU amount detection.

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 355454761b80a53a0c81cb04971b726e87d296ac..b005afc18fd49ec7b654880df05f60e2629afccc 100755 (executable)
--- 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
 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
 
 ##############################################################################
 # 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=,,')
                ;;
                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
                *)
                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 "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
 
 ##############################################################################
 # Version and download url settings section


@@ -123,12 +129,18 @@ LIBOPENSTM32=master
 # Flags section
 ##############################################################################
 
 # 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
 else

-       CPUS=1
+       PARALLEL=-j${CPUS}

 fi
 fi

-PARALLEL=-j$((CPUS + 1))
+

 echo "${CPUS} cpu's detected running make with '${PARALLEL}' flag"
 
 GDBFLAGS=
 echo "${CPUS} cpu's detected running make with '${PARALLEL}' flag"
 
 GDBFLAGS=