wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-29 19:03:16 +02:00
Code Activity

* A switch `-j NUMBER' to set the maximum number of parallel jobs (0 =

Browse source 
no limit).
* Add missing file to distribution.
This commit is contained in:
Eelco Dolstra 2004-05-12 14:20:32 +00:00
parent 1f48aa0be7
commit efa5fa1a91
5 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libstore/normalise.cc
View file

@ -284,6 +284,9 @@ bool Normaliser::startBuild(Path nePath)
{
checkInterrupt();
if (maxBuildJobs > 0 && building.size() >= maxBuildJobs)
return false;
Goals::iterator goalIt = goals.find(nePath);
assert(goalIt != goals.end());
Goal & goal(goalIt->second);
@ -414,11 +417,6 @@ bool Normaliser::startBuild(Path nePath)
format("build hook died with status %1%") % status);
}
/* Right platform? */
if (goal.expr.derivation.platform != thisSystem)
throw Error(format("a `%1%' is required, but I am a `%2%'")
% goal.expr.derivation.platform % thisSystem);
/* Otherwise, start the build in a child process. */
startBuildChild(goal);
@ -428,6 +426,11 @@ bool Normaliser::startBuild(Path nePath)
void Normaliser::startBuildChild(Goal & goal)
{
/* Right platform? */
if (goal.expr.derivation.platform != thisSystem)
throw Error(format("a `%1%' is required, but I am a `%2%'")
% goal.expr.derivation.platform % thisSystem);
/* If any of the outputs already exist but are not registered,
delete them. */
for (PathSet::iterator i = goal.expr.derivation.outputs.begin();