From 3c14e712caf5fe265e78fa1d54bd10b95dca98da Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Tue, 15 Jun 2010 19:00:51 +0000 Subject: [PATCH] setup.sh: add -j and -l options svn path=/nixpkgs/branches/stdenv-updates/; revision=22283 --- pkgs/stdenv/generic/setup.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index a9f4d4dc357..644218fdbf3 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -79,9 +79,19 @@ cmd(){ } runMake(){ - cmd make ${makefile:+-f $makefile} "$@" + local optout=NO_PARALLEL_BUILD_${curPhase} + [ -n "${!optout}" ] || \ + local j="$makeFlagsParallelBuild" + cmd make ${makefile:+-f $makefile} "$@" $j } +###################################################################### +# parallel builds: opt-out +# - in a phase: set NO_PARALLEL_BUILD_${PHASE_NAME} +# - for this build: pass NUM_CORES=1 to the builder +if [ "$NUM_CORES" != 1 ]; then + makeFlagsParallelBuild="-j $NIX_MAX_PARALLELIZATION -l $NIX_TARGET_LOAD" +fi ###################################################################### # Initialisation.