Whoopsie, now with better CPU detection and fallback

build-codeblocks-project.sh

@@ -11,7 +11,8 @@ cd codeblocks
 if [ -f 'CMakeCache.txt' ]; then rm -f 'CMakeCache.txt'; fi
 
 LANG=C
-NUMCORES=`nproc`
+NUMCORES=`lscpu -p | grep -cv '^#'`
+if [ "$NUMCORES" = '' ]; then NUMCORES=1; fi
 
 # This is for regular developers and used by our installer
 cmake -G"CodeBlocks - Unix Makefiles" -DCMAKE_INSTALL_PREFIX= -DWANT_STATIC_LIBS=ON -DCMAKE_ECLIPSE_MAKE_ARGUMENTS=-j$NUMCORES ${CURRENTDIR}

build-eclipse-project.sh

@@ -11,7 +11,8 @@ cd eclipse
 if [ -f 'CMakeCache.txt' ]; then rm -f 'CMakeCache.txt'; fi
 
 LANG=C
-NUMCORES=`nproc`
+NUMCORES=`lscpu -p | grep -cv '^#'`
+if [ "$NUMCORES" = '' ]; then NUMCORES=1; fi
 
 # This is for regular developers and used by our installer
 cmake -G"Eclipse CDT4 - Unix Makefiles" -DCMAKE_INSTALL_PREFIX= -DWANT_STATIC_LIBS=ON -DCMAKE_ECLIPSE_MAKE_ARGUMENTS=-j$NUMCORES ${CURRENTDIR}

build-mg-win32.sh

@@ -5,7 +5,8 @@
 # Originally written by Mark Vejvoda <mark_vejvoda@hotmail.com>
 # Copyright (c) 2012 Mark Vejvoda under GNU GPL v3.0
 
-NUMCORES=`nproc`
+NUMCORES=`lscpu -p | grep -cv '^#'`
+if [ "$NUMCORES" = '' ]; then NUMCORES=1; fi
 
 #PROJECT_SOURCE_DIR="$(dirname $(readlink -f $0))"
 mkdir -p build-win32

build-mg.sh

@@ -5,7 +5,8 @@
 # Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
 
 LANG=C
-NUMCORES=`nproc`
+NUMCORES=`lscpu -p | grep -cv '^#'`
+if [ "$NUMCORES" = '' ]; then NUMCORES=1; fi
 
 mkdir -p build
 cd build

mk/linux/mojosetup/megaglest-installer/make.sh

@@ -119,7 +119,8 @@ CXX=/usr/bin/g++
 
 OSTYPE=`uname -s`
 if [ "$OSTYPE" = "Linux" ]; then
-    NCPU=`nproc`
+    NCPU=`lscpu -p | grep -cv '^#'`
+    if [ "$NUMCORES" = '' ]; then NUMCORES=1; fi
 elif [ "$OSTYPE" = "Darwin" ]; then
     NCPU=`sysctl -n hw.ncpu`
 elif [ "$OSTYPE" = "SunOS" ]; then