bbjubjub2494/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #4443 from rickynils/prefer-local-build-respect-zero-max-jobs

Browse source 
Don't let 'preferLocalBuild' override 'max-jobs=0'
This commit is contained in:
Eelco Dolstra 2021-01-13 12:15:54 +01:00 committed by GitHub
parent 2f463e90ed 0ca1a50132
commit fbfa70dc02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/build/derivation-goal.cc
View file

@ -679,13 +679,9 @@ void DerivationGoal::tryToBuild()
} }
void DerivationGoal::tryLocalBuild() { void DerivationGoal::tryLocalBuild() {
bool buildLocally = buildMode != bmNormal || parsedDrv->willBuildLocally(worker.store); /* Make sure that we are allowed to start a build. */
/* Make sure that we are allowed to start a build. If this
derivation prefers to be done locally, do it even if
maxBuildJobs is 0. */
unsigned int curBuilds = worker.getNrLocalBuilds(); unsigned int curBuilds = worker.getNrLocalBuilds();
if (curBuilds >= settings.maxBuildJobs && !(buildLocally && curBuilds == 0)) { if (curBuilds >= settings.maxBuildJobs) {
worker.waitForBuildSlot(shared_from_this()); worker.waitForBuildSlot(shared_from_this());
outputLocks.unlock(); outputLocks.unlock();
return; return;

4
src/libstore/parsed-derivations.cc
View file

@ -101,6 +101,10 @@ bool ParsedDerivation::canBuildLocally(Store & localStore) const
&& !drv.isBuiltin()) && !drv.isBuiltin())
return false; return false;
if (settings.maxBuildJobs.get() == 0
&& !drv.isBuiltin())
return false;
for (auto & feature : getRequiredSystemFeatures()) for (auto & feature : getRequiredSystemFeatures())
if (!localStore.systemFeatures.get().count(feature)) return false; if (!localStore.systemFeatures.get().count(feature)) return false;