forked from mirrors/nixpkgs
no longer pass -j to make without arg which means no limit on forks. This brought down the build farm
svn path=/nixpkgs/branches/stdenv-updates/; revision=22293
This commit is contained in:
parent
2dafd54743
commit
f446814260
|
@ -90,7 +90,7 @@ runMake(){
|
||||||
# - in a phase: set NO_PARALLEL_BUILD_${PHASE_NAME}
|
# - in a phase: set NO_PARALLEL_BUILD_${PHASE_NAME}
|
||||||
# - for this build: pass NUM_CORES=1 to the builder
|
# - for this build: pass NUM_CORES=1 to the builder
|
||||||
if [ "$NUM_CORES" != 1 ]; then
|
if [ "$NUM_CORES" != 1 ]; then
|
||||||
makeFlagsParallelBuild="-j $NIX_MAX_PARALLELIZATION -l $NIX_TARGET_LOAD"
|
makeFlagsParallelBuild="-j ${NIX_MAX_PARALLELIZATION:-1} ${NIX_TARGET_LOAD:+-l} $NIX_TARGET_LOAD"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
Loading…
Reference in a new issue