diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-04-05 11:36:01 -0700 |
|---|---|---|
| committer | Mark Simulacrum <mark.simulacrum@gmail.com> | 2018-05-24 14:22:31 -0600 |
| commit | 4c67e7069cfdc90047058145e420697c04dd1b3f (patch) | |
| tree | 5f6fd85e23c72b6732bea66025591f3e0ea5a032 | |
| parent | a7756804103447ea4e68a71ccf071e7ad8f7a03e (diff) | |
| download | rust-4c67e7069cfdc90047058145e420697c04dd1b3f.tar.gz rust-4c67e7069cfdc90047058145e420697c04dd1b3f.zip | |
Filter out missing components from manifests
This commit updates our manifest generation for rustup to filter out any components/extensions which are actually missing. This is intended to help mitigate #49462 by making the manifests reflect reality, that many targets now are missing a `rust-docs` component rather than requiring it exists.
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 49b054f8b9e..0f482c95e05 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -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)), |
