lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

build-remote: store maxBuildJobs before forcing it to 1

Browse source
This commit is contained in:
Yorick 2023-02-07 12:08:00 +01:00
parent 3050005211
commit 631ba6442a
No known key found for this signature in database
GPG key ID: A36E70F9DC014A15
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/build-remote/build-remote.cc
View file

@ -72,6 +72,7 @@ static int main_build_remote(int argc, char * * argv)
settings.set(name, value); settings.set(name, value);
} }
auto maxBuildJobs = settings.maxBuildJobs;
settings.maxBuildJobs.set("1"); // hack to make tests with local?root= work settings.maxBuildJobs.set("1"); // hack to make tests with local?root= work
initPlugins(); initPlugins();
@ -114,7 +115,7 @@ static int main_build_remote(int argc, char * * argv)
/* It would be possible to build locally after some builds clear out, /* It would be possible to build locally after some builds clear out,
so don't show the warning now: */ so don't show the warning now: */
bool couldBuildLocally = settings.maxBuildJobs > 0 bool couldBuildLocally = maxBuildJobs > 0
&& ( neededSystem == settings.thisSystem && ( neededSystem == settings.thisSystem
|| settings.extraPlatforms.get().count(neededSystem) > 0) || settings.extraPlatforms.get().count(neededSystem) > 0)
&& allSupportedLocally(*store, requiredFeatures); && allSupportedLocally(*store, requiredFeatures);