Fix bug in RuleBuilderCommand.OrderOnlys

Order only dependencies that were added to a RuleBuilderCommand were
only propagated to the rule that was created for a missing dependencies
error.  Set them on the main rule instead.

Test: TestRuleBuilder_build
Change-Id: I049d1bb921778d18d678439d236f69081927dc70
This commit is contained in:
Colin Cross
2021-04-21 11:32:19 -07:00
parent 14d09018eb
commit da6401b770
2 changed files with 38 additions and 21 deletions

View File

@@ -460,7 +460,6 @@ func (r *RuleBuilder) Build(name string, desc string) {
r.ctx.Build(pctx, BuildParams{
Rule: ErrorRule,
Outputs: r.Outputs(),
OrderOnly: r.OrderOnlys(),
Description: desc,
Args: map[string]string{
"error": "missing dependencies: " + strings.Join(r.missingDeps, ", "),
@@ -707,6 +706,7 @@ func (r *RuleBuilder) Build(name string, desc string) {
}),
Inputs: rspFileInputs,
Implicits: inputs,
OrderOnly: r.OrderOnlys(),
Output: output,
ImplicitOutputs: implicitOutputs,
SymlinkOutputs: r.SymlinkOutputs(),