Skip to content

Commit

Permalink
Rollup merge of rust-lang#49705 - alexcrichton:less-manifest-docs, r=…
Browse files Browse the repository at this point in the history
…kennytm
  • Loading branch information
alexcrichton committed Apr 5, 2018
2 parents 4d239ab + 59059f2 commit cd615e9
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions src/tools/build-manifest/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,28 @@ impl Builder {
target: "*".to_string(),
});

// If the components/extensions don't actually exist for this
// particular host/target combination then nix it entirely from our
// lists.
{
let has_component = |c: &Component| {
if c.target == "*" {
return true
}
let pkg = match manifest.pkg.get(&c.pkg) {
Some(p) => p,
None => return false,
};
let target = match pkg.target.get(&c.target) {
Some(t) => t,
None => return false,
};
target.available
};
extensions.retain(&has_component);
components.retain(&has_component);
}

pkg.target.insert(host.to_string(), Target {
available: true,
url: Some(self.url(&filename)),
Expand Down

0 comments on commit cd615e9

Please sign in to comment.