Skip to content

Make docs required again #40526

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.

Sign up for GitHub

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 1 commit into from
Mar 17, 2017
Merged

Make docs required again #40526

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 3 additions & 8 deletions src/tools/build-manifest/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down