Skip to content

Rollup of 8 pull requests #49696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Apr 5, 2018
Merged
Changes from 2 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
29a4ec0
Make queries thread safe. Remove the query stack and make queries poi…
Zoxc Mar 15, 2018
4f7d0fd
Some cleanups and added comments
Zoxc Mar 24, 2018
71dc162
Tweak `Clause` definition and HRTBs
scalexm Mar 28, 2018
1074a22
Fix comment
scalexm Apr 2, 2018
553c04d
proc_macro: Reorganize public API
alexcrichton Apr 2, 2018
c4c5214
impl Unpin for Pin
Nemo157 Apr 3, 2018
5d74990
expand macro invocations in `extern {}` blocks
abonander Mar 11, 2018
a57b1fb
Tweak doc comment expansion
alexcrichton Apr 4, 2018
64ddb39
typos
memoryleak47 Apr 5, 2018
b0bd9a7
Rollup merge of #49045 - Zoxc:tls, r=michaelwoerister
alexcrichton Apr 5, 2018
46492ff
Rollup merge of #49350 - abonander:macros-in-extern, r=petrochenkov
alexcrichton Apr 5, 2018
649f431
Give a name to every CI job.
kennytm Apr 5, 2018
a29d4d9
impl Unpin for PinBox
Nemo157 Apr 5, 2018
72ac3eb
Rollup merge of #49497 - scalexm:hrtb, r=nikomatsakis
alexcrichton Apr 5, 2018
e6947ec
Rollup merge of #49597 - alexcrichton:proc-macro-v2, r=petrochenkov
alexcrichton Apr 5, 2018
71bf15c
Rollup merge of #49686 - memoryleak47:typo, r=alexcrichton
alexcrichton Apr 5, 2018
59059f2
Filter out missing components from manifests
alexcrichton Apr 5, 2018
83669ec
Rollup merge of #49621 - Nemo157:impl-unpin-for-pin, r=withoutboats
alexcrichton Apr 5, 2018
4d239ab
Rollup merge of #49697 - kennytm:name-every-builder, r=aturon
alexcrichton Apr 5, 2018
cd615e9
Rollup merge of #49705 - alexcrichton:less-manifest-docs, r=kennytm
alexcrichton Apr 5, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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