bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustbuild: Tweak default rule inclusion

Browse source 
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.
This commit is contained in:
Alex Crichton 2016-11-14 12:50:38 -08:00
parent 766f6e4782
commit 7cd8a497cc
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/bootstrap/step.rs
View file

@ -565,7 +565,8 @@ impl<'a> Rules<'a> {
for dep in rule.deps.iter() { for dep in rule.deps.iter() {
let dep = dep(&self.sbuild.name(rule.name)); let dep = dep(&self.sbuild.name(rule.name));
if self.rules.contains_key(&dep.name) || dep.name.starts_with("default:") { if self.rules.contains_key(&dep.name) || dep.name.starts_with("default:") {
continue } continue
}
panic!("\ panic!("\
invalid rule dependency graph detected, was a rule added and maybe typo'd? invalid rule dependency graph detected, was a rule added and maybe typo'd?
@ -686,8 +687,9 @@ invalid rule dependency graph detected, was a rule added and maybe typo'd?
"dist" => Kind::Dist, "dist" => Kind::Dist,
kind => panic!("unknown kind: `{}`", kind), 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); 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); self.fill(dep.name(rule.name), order, added);
} }
} else { } else {