From da302b598fcaab892e54079b6f95bb2db9cc8d47 Mon Sep 17 00:00:00 2001 From: Ariya Hidayat Date: Sun, 15 Apr 2012 18:21:02 -0700 Subject: [PATCH] Build system: do not assume 4 parallel jobs on Linux. Try to grab the number of CPU cores from /proc/cpuinfo and use it as the number of parallel make jobs (limit to 8 as a safety measure). http://code.google.com/p/phantomjs/issues/detail?id=454 --- build.sh | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 9cf968a2..e7e061da 100755 --- a/build.sh +++ b/build.sh @@ -1,9 +1,25 @@ #!/bin/bash -COMPILE_JOBS=4 - QT_CFG='' +COMPILE_JOBS=1 + +if [[ $OSTYPE = darwin* ]]; then + # We only support modern Mac machines, they are at least using + # hyperthreaded dual-core CPU. + COMPILE_JOBS=4 +else + CPU_CORES=`grep -c ^processor /proc/cpuinfo` + if [[ "$CPU_CORES" -gt 1 ]]; then + COMPILE_JOBS=$CPU_CORES + if [[ "$COMPILE_JOBS" -gt 8 ]]; then + # Safety net. + COMPILE_JOBS=8 + fi + fi +fi + + until [ -z "$1" ]; do case $1 in "--qt-config")