about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMark Simulacrum <mark.simulacrum@gmail.com>2017-09-06 18:27:56 -0600
committerGitHub <noreply@github.com>2017-09-06 18:27:56 -0600
commit596e97fdcead6c49386e952690656dffededce57 (patch)
treecfe0c68f86e58fd8987ae1014634a9324a366cc9 /src
parent405123391a8d66c1eaa86203a752df8a3b1076b8 (diff)
parentfcefe36ce70d87cfb26cc1b10c8668aaf9eca1f6 (diff)
downloadrust-596e97fdcead6c49386e952690656dffededce57.tar.gz
rust-596e97fdcead6c49386e952690656dffededce57.zip
Rollup merge of #44321 - jakllsch:jakllsch-4f2d6c87-2674-43e4-9c5f-2415136e6bdc, r=Mark-Simulacrum
bootstrap: only include docs in extended distribution if enabled

Fixes #44163
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/dist.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 609802c4767..2ca65396b35 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -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());
         }