From 9b7cedd89ba9825f29544cf6606db202fb0c4c49 Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Tue, 8 Mar 2011 15:43:43 -0800 Subject: [PATCH] Added option to override the automatic CPU amount detection. --- summon-arm-toolchain | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/summon-arm-toolchain b/summon-arm-toolchain index 3554547..b005afc 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= -- 2.30.2