Skip to content

Commit

Permalink
rustbuild: Tweak default rule inclusion
Browse files Browse the repository at this point in the history
If a rule is flagged with `default(true)` then the pseudo-rule `default:foo`
will include that. If a rule is also flagged with `.host(true)`, however, then
the rule shouldn't be included for targets that aren't in the host array. This
adds a filter to ensure we don't pull in host rules for targets by accident.
  • Loading branch information
alexcrichton committed Nov 15, 2016
1 parent 3e2a387 commit d376b66
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/bootstrap/step.rs
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,8 @@ impl<'a> Rules<'a> {
for dep in rule.deps.iter() {
let dep = dep(&self.sbuild.name(rule.name));
if self.rules.contains_key(&dep.name) || dep.name.starts_with("default:") {
continue }
continue
}
panic!("\
invalid rule dependency graph detected, was a rule added and maybe typo'd?
Expand Down Expand Up @@ -686,8 +687,9 @@ invalid rule dependency graph detected, was a rule added and maybe typo'd?
"dist" => Kind::Dist,
kind => panic!("unknown kind: `{}`", kind),
};
let host = self.build.config.host.iter().any(|h| h == dep.target);
let rules = self.rules.values().filter(|r| r.default);
for rule in rules.filter(|r| r.kind == kind) {
for rule in rules.filter(|r| r.kind == kind && (!r.host || host)) {
self.fill(dep.name(rule.name), order, added);
}
} else {
Expand Down

0 comments on commit d376b66

Please sign in to comment.