diff options
| author | Brian Anderson <banderson@mozilla.com> | 2017-03-14 19:31:20 +0000 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2017-03-14 19:31:20 +0000 |
| commit | 3554ff32db74b431dfb356cc4533514544c67bf9 (patch) | |
| tree | ed29487b87eb2d44d699ca6ebeb603d887c720dc | |
| parent | 6f10e2f63de720468e2b4bfcb275e4b90b1f9870 (diff) | |
| download | rust-3554ff32db74b431dfb356cc4533514544c67bf9.tar.gz rust-3554ff32db74b431dfb356cc4533514544c67bf9.zip | |
Make docs required again
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index c2ec42195fc..adddd7b7e89 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -250,12 +250,13 @@ impl Builder { let mut components = Vec::new(); let mut extensions = Vec::new(); - // rustc/rust-std/cargo are all required, and so is rust-mingw if it's - // available for the target. + // rustc/rust-std/cargo/docs are all required, and so is rust-mingw + // if it's available for the target. components.extend(vec![ Component { pkg: "rustc".to_string(), target: host.to_string() }, Component { pkg: "rust-std".to_string(), target: host.to_string() }, Component { pkg: "cargo".to_string(), target: host.to_string() }, + Component { pkg: "rust-docs".to_string(), target: host.to_string() }, ]); if host.contains("pc-windows-gnu") { components.push(Component { @@ -264,12 +265,6 @@ impl Builder { }); } - // Docs, other standard libraries, and the source package are all - // optional. - extensions.push(Component { - pkg: "rust-docs".to_string(), - target: host.to_string(), - }); for target in TARGETS { if target != host { extensions.push(Component { |
