Author: MarcWeber Date: 2010-06-16 12:39:19 +0000 (Wed, 16 Jun 2010) New Revision: 22293
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22293&view=rev Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh Log: no longer pass -j to make without arg which means no limit on forks. This brought down the build farm Changes: Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh 2010-06-16 11:50:06 UTC (rev 22292) +++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh 2010-06-16 12:39:19 UTC (rev 22293) @@ -90,7 +90,7 @@ # - 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 ###################################################################### _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
