Skip to content

Commit

Permalink
Inline inputsRealised
Browse files Browse the repository at this point in the history
  • Loading branch information
Ericson2314 committed Feb 3, 2025
1 parent 4b1753e commit b3b7419
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
5 changes: 0 additions & 5 deletions src/libstore/build/derivation-goal.cc
Original file line number Diff line number Diff line change
Expand Up @@ -382,12 +382,7 @@ Goal::Co DerivationGoal::gaveUpOnSubstitution()
}

if (!waitees.empty()) co_await Suspend{}; /* to prevent hang (no wake-up event) */
co_return inputsRealised();
}


Goal::Co DerivationGoal::inputsRealised()
{
trace("all inputs realised");

if (nrFailed != 0) {
Expand Down
3 changes: 1 addition & 2 deletions src/libstore/build/derivation-goal.hh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ struct DerivationGoal : public Goal
/**
* Mapping from input derivations + output names to actual store
* paths. This is filled in by waiteeDone() as each dependency
* finishes, before inputsRealised() is reached.
* finishes, before `trace("all inputs realised")` is reached.
*/
std::map<std::pair<StorePath, std::string>, StorePath> inputDrvOutputs;

Expand Down Expand Up @@ -235,7 +235,6 @@ struct DerivationGoal : public Goal
Co init() override;
Co haveDerivation();
Co gaveUpOnSubstitution();
Co inputsRealised();
Co tryToBuild();
virtual Co tryLocalBuild();
Co buildDone();
Expand Down

0 comments on commit b3b7419

Please sign in to comment.