about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-04-14 00:38:58 -0700
committerbors <bors@rust-lang.org>2016-04-14 00:38:58 -0700
commit374d262b3a917df948df211eba44be1334f7236d (patch)
tree34252318102e25c605e10e1026ecdc5b6468c5b3 /src
parent0cb2ee2ef6398296fbfd70ac5d71d9961955dc48 (diff)
parent2805e83dcb3762994b8802fa766c88ca93c5b839 (diff)
Auto merge of #32718 - timonvo:bootstrap-skip-docs, r=alexcrichton
rustbuild: Skip generating docs if the config disables them.

r? @alexcrichton
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/build/step.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/bootstrap/build/step.rs b/src/bootstrap/build/step.rs
index 45e0cb11010..2312f96348c 100644
--- a/src/bootstrap/build/step.rs
+++ b/src/bootstrap/build/step.rs
@@ -150,7 +150,9 @@ fn top_level(build: &Build) -> Vec<Step> {
             src: Source::Llvm { _dummy: () },
             target: &build.config.build,
         };
-        targets.push(t.doc(stage));
+        if build.config.docs {
+          targets.push(t.doc(stage));
+        }
         for host in build.config.host.iter() {
             if !build.flags.host.contains(host) {
                 continue
@@ -356,7 +358,9 @@ impl<'a> Step<'a> {
                     let compiler = self.compiler(stage);
                     for target in build.config.target.iter() {
                         let target = self.target(target);
-                        base.push(target.dist_docs(stage));
+                        if build.config.docs {
+                            base.push(target.dist_docs(stage));
+                        }
                         base.push(target.dist_std(compiler));
                     }
                 }