Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build_all.sh update #13320

Merged
merged 4 commits into from
Feb 4, 2020
Merged
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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