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.

Sign up for GitHub

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

Make build_all.sh more portable and a bit simpler #13308

Merged
merged 1 commit into from
Feb 3, 2020
Merged

Make build_all.sh more portable and a bit simpler #13308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions build_all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -u # error on undefined variables
set -e # exit on first error

echo_run(){
printf "\n$*\n"
echo "$*"
"$@"
}

Expand All @@ -21,7 +21,7 @@ build_nim_csources_via_script(){
}

build_nim_csources(){
## avoid changing dir in case of failure
# avoid changing dir in case of failure
(
if [[ $# -ne 0 ]]; then
# some args were passed (eg: `--cpu i386`), need to call build.sh
Expand All @@ -33,10 +33,7 @@ build_nim_csources(){
if [ "$unamestr" = 'FreeBSD' ]; then
makeX=gmake
fi
# see https://stackoverflow.com/a/53427092/1426932
logicalCpus=$(nproc 2>/dev/null || sysctl -n hw.logicalcpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
# +1: see https://unix.stackexchange.com/questions/519092/what-is-the-logic-of-using-nproc-1-in-make-command
which $makeX && echo_run $makeX -C csources -j $(($logicalCpus + 1)) || build_nim_csources_via_script
which $makeX && echo_run $makeX -C csources -j -l 80 || build_nim_csources_via_script
fi
)
# keep $nim_csources in case needed to investigate bootstrap issues
Expand Down