Skip to content

Commit

Permalink
Rollup merge of rust-lang#44321 - jakllsch:jakllsch-4f2d6c87-2674-43e…
Browse files Browse the repository at this point in the history
…4-9c5f-2415136e6bdc, r=Mark-Simulacrum

bootstrap: only include docs in extended distribution if enabled

Fixes rust-lang#44163
  • Loading branch information
Mark-Simulacrum authored Sep 6, 2017
2 parents a660f0c + fcefe36 commit bc52d58
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1173,7 +1173,10 @@ impl Step for Extended {
// the std files during uninstall. To do this ensure that rustc comes
// before rust-std in the list below.
let mut tarballs = vec![rustc_installer, cargo_installer, rls_installer,
analysis_installer, docs_installer, std_installer];
analysis_installer, std_installer];
if build.config.docs {
tarballs.push(docs_installer);
}
if target.contains("pc-windows-gnu") {
tarballs.push(mingw_installer.unwrap());
}
Expand Down

0 comments on commit bc52d58

Please sign in to comment.