Skip to content

Commit

Permalink
build_all.sh update (#13320)
Browse files Browse the repository at this point in the history
* Don't overload the system, don't crash when you can't determine the CPU count and don't rely on bash

* Extract to variable

* Limit number of spawned jobs for systems with weak IO

* Use proper arithmetic braces
  • Loading branch information
Clyybber authored Feb 4, 2020
1 parent 955465e commit ab525cc
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions build_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ build_nim_csources_via_script(){
build_nim_csources(){
# avoid changing dir in case of failure
(
if [[ $# -ne 0 ]]; then
if [ $# -ne 0 ]; then
# some args were passed (eg: `--cpu i386`), need to call build.sh
build_nim_csources_via_script "$@"
else
Expand All @@ -33,7 +33,8 @@ build_nim_csources(){
if [ "$unamestr" = 'FreeBSD' ]; then
makeX=gmake
fi
which $makeX && echo_run $makeX -C csources -j -l 80 || build_nim_csources_via_script
nCPU=$(nproc 2>/dev/null || sysctl -n hw.logicalcpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null || 1)
which $makeX && echo_run $makeX -C csources -j $((nCPU + 2)) -l $nCPU || build_nim_csources_via_script
fi
)
# keep $nim_csources in case needed to investigate bootstrap issues
Expand Down

0 comments on commit ab525cc

Please sign in to comment.