Merge pull request #5003 from gilles-peskine-arm/all.sh-makeflags-nproc
Limit make parallelism to the number of CPUs in all.sh
This commit is contained in:
commit
bf3ec84b1c
1 changed files with 13 additions and 1 deletions
|
@ -175,7 +175,7 @@ pre_initialize_variables () {
|
|||
|
||||
# if MAKEFLAGS is not set add the -j option to speed up invocations of make
|
||||
if [ -z "${MAKEFLAGS+set}" ]; then
|
||||
export MAKEFLAGS="-j"
|
||||
export MAKEFLAGS="-j$(all_sh_nproc)"
|
||||
fi
|
||||
|
||||
# Include more verbose output for failing tests run by CMake or make
|
||||
|
@ -343,6 +343,18 @@ trap 'fatal_signal HUP' HUP
|
|||
trap 'fatal_signal INT' INT
|
||||
trap 'fatal_signal TERM' TERM
|
||||
|
||||
# Number of processors on this machine. Used as the default setting
|
||||
# for parallel make.
|
||||
all_sh_nproc ()
|
||||
{
|
||||
{
|
||||
nproc || # Linux
|
||||
sysctl -n hw.ncpuonline || # NetBSD, OpenBSD
|
||||
sysctl -n hw.ncpu || # FreeBSD
|
||||
echo 1
|
||||
} 2>/dev/null
|
||||
}
|
||||
|
||||
msg()
|
||||
{
|
||||
if [ -n "${current_component:-}" ]; then
|
||||
|
|
Loading…
Reference in a new issue