From f446814260c66591300231a8b7ba9e01edfaa7ce Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 16 Jun 2010 12:39:19 +0000
Subject: [PATCH] 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
---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 644218fdbf3..5a92f2d33bf 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -90,7 +90,7 @@ runMake(){
 # - 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"
+  makeFlagsParallelBuild="-j ${NIX_MAX_PARALLELIZATION:-1} ${NIX_TARGET_LOAD:+-l} $NIX_TARGET_LOAD"
 fi
 
 ######################################################################