DerivationGoal: only retry if output closure incomplete is only problem
This commit is contained in:
parent
ea8d32020e
commit
bd9eb5c743
1 changed files with 7 additions and 2 deletions
|
@ -330,8 +330,13 @@ void DerivationGoal::outputsSubstitutionTried()
|
||||||
|
|
||||||
/* If the substitutes form an incomplete closure, then we should
|
/* If the substitutes form an incomplete closure, then we should
|
||||||
build the dependencies of this derivation, but after that, we
|
build the dependencies of this derivation, but after that, we
|
||||||
can still use the substitutes for this derivation itself. */
|
can still use the substitutes for this derivation itself.
|
||||||
if (nrIncompleteClosure > 0) retrySubstitution = true;
|
|
||||||
|
If the nrIncompleteClosure != nrFailed, we have another issue as well.
|
||||||
|
In particular, it may be the case that the hole in the closure is
|
||||||
|
an output of the current derivation, which causes a loop if retried.
|
||||||
|
*/
|
||||||
|
if (nrIncompleteClosure > 0 && nrIncompleteClosure == nrFailed) retrySubstitution = true;
|
||||||
|
|
||||||
nrFailed = nrNoSubstituters = nrIncompleteClosure = 0;
|
nrFailed = nrNoSubstituters = nrIncompleteClosure = 0;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue