Use 'nproc' command instead of /proc/cpuinfo (doesn't work on armv5tel) to determine # of cores (lscpu can be another option)
This commit is contained in:
parent
c10bb9f10e
commit
a6e6ab8f53
|
@ -11,7 +11,7 @@ cd codeblocks
|
||||||
if [ -f 'CMakeCache.txt' ]; then rm -f 'CMakeCache.txt'; fi
|
if [ -f 'CMakeCache.txt' ]; then rm -f 'CMakeCache.txt'; fi
|
||||||
|
|
||||||
LANG=C
|
LANG=C
|
||||||
NUMCORES=`cat /proc/cpuinfo | grep -cE '^processor'`
|
NUMCORES=`nproc`
|
||||||
|
|
||||||
# This is for regular developers and used by our installer
|
# 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}
|
cmake -G"CodeBlocks - Unix Makefiles" -DCMAKE_INSTALL_PREFIX= -DWANT_STATIC_LIBS=ON -DCMAKE_ECLIPSE_MAKE_ARGUMENTS=-j$NUMCORES ${CURRENTDIR}
|
||||||
|
|
|
@ -11,7 +11,7 @@ cd eclipse
|
||||||
if [ -f 'CMakeCache.txt' ]; then rm -f 'CMakeCache.txt'; fi
|
if [ -f 'CMakeCache.txt' ]; then rm -f 'CMakeCache.txt'; fi
|
||||||
|
|
||||||
LANG=C
|
LANG=C
|
||||||
NUMCORES=`cat /proc/cpuinfo | grep -cE '^processor'`
|
NUMCORES=`nproc`
|
||||||
|
|
||||||
# This is for regular developers and used by our installer
|
# 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}
|
cmake -G"Eclipse CDT4 - Unix Makefiles" -DCMAKE_INSTALL_PREFIX= -DWANT_STATIC_LIBS=ON -DCMAKE_ECLIPSE_MAKE_ARGUMENTS=-j$NUMCORES ${CURRENTDIR}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
# Originally written by Mark Vejvoda <mark_vejvoda@hotmail.com>
|
# Originally written by Mark Vejvoda <mark_vejvoda@hotmail.com>
|
||||||
# Copyright (c) 2012 Mark Vejvoda under GNU GPL v3.0
|
# Copyright (c) 2012 Mark Vejvoda under GNU GPL v3.0
|
||||||
|
|
||||||
NUMCORES=`cat /proc/cpuinfo | grep -cE '^processor'`
|
NUMCORES=`nproc`
|
||||||
|
|
||||||
#PROJECT_SOURCE_DIR="$(dirname $(readlink -f $0))"
|
#PROJECT_SOURCE_DIR="$(dirname $(readlink -f $0))"
|
||||||
mkdir -p build-win32
|
mkdir -p build-win32
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
# Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
|
# Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
|
||||||
|
|
||||||
LANG=C
|
LANG=C
|
||||||
NUMCORES=`cat /proc/cpuinfo | grep -cE '^processor'`
|
NUMCORES=`nproc`
|
||||||
|
|
||||||
mkdir -p build
|
mkdir -p build
|
||||||
cd build
|
cd build
|
||||||
|
|
|
@ -119,8 +119,7 @@ CXX=/usr/bin/g++
|
||||||
|
|
||||||
OSTYPE=`uname -s`
|
OSTYPE=`uname -s`
|
||||||
if [ "$OSTYPE" = "Linux" ]; then
|
if [ "$OSTYPE" = "Linux" ]; then
|
||||||
NCPU=`cat /proc/cpuinfo |grep vendor_id |wc -l`
|
NCPU=`nproc`
|
||||||
let NCPU=$NCPU+1
|
|
||||||
elif [ "$OSTYPE" = "Darwin" ]; then
|
elif [ "$OSTYPE" = "Darwin" ]; then
|
||||||
NCPU=`sysctl -n hw.ncpu`
|
NCPU=`sysctl -n hw.ncpu`
|
||||||
elif [ "$OSTYPE" = "SunOS" ]; then
|
elif [ "$OSTYPE" = "SunOS" ]; then
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
LANG=C
|
LANG=C
|
||||||
VERSION='0.3.3'
|
VERSION='0.3.4'
|
||||||
MYNAME=`basename $0`
|
MYNAME=`basename $0`
|
||||||
DEFAULT_REPORT_FILENAME=system_report.log
|
DEFAULT_REPORT_FILENAME=system_report.log
|
||||||
|
|
||||||
|
@ -284,8 +284,8 @@ echo '' >> $REPORT_LOCATION
|
||||||
echo '' >> $REPORT_LOCATION
|
echo '' >> $REPORT_LOCATION
|
||||||
echo '***** CPU **********************************************************************' >> $REPORT_LOCATION
|
echo '***** CPU **********************************************************************' >> $REPORT_LOCATION
|
||||||
echo '' >> $REPORT_LOCATION
|
echo '' >> $REPORT_LOCATION
|
||||||
echo '>>> cat /proc/cpuinfo | awk -F : '"'"'/^model name/ { print $2 }' >> $REPORT_LOCATION
|
echo '>>> cat /proc/cpuinfo' >> $REPORT_LOCATION
|
||||||
cat /proc/cpuinfo | awk -F : '/^model name/ { print $2 }' >> $REPORT_LOCATION
|
cat /proc/cpuinfo >> $REPORT_LOCATION
|
||||||
sleep 1
|
sleep 1
|
||||||
|
|
||||||
echo ' → Memory'
|
echo ' → Memory'
|
||||||
|
|
Loading…
Reference in New Issue