OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #40526 - brson:docs-req, r=alexcrichton 

Make docs required again

Completely untested. Fixes https://github.com/rust-lang-nursery/rustup.rs/issues/903

r? @alexcrichton cc @steveklabnik
This commit is contained in:
bors 2017-03-17 09:22:09 +00:00
parent 0aeb9c1297 3554ff32db
commit b3234cd427
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tools/build-manifest/src/main.rs
View File

@ -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 {