diff options
| author | Timon Van Overveldt <timonvo@gmail.com> | 2016-04-03 21:09:19 -0700 |
|---|---|---|
| committer | Timon Van Overveldt <timonvo@gmail.com> | 2016-04-13 18:36:58 -0700 |
| commit | 2805e83dcb3762994b8802fa766c88ca93c5b839 (patch) | |
| tree | 9dad7ea689c84858ec853ad6a29058585e0eebde | |
| parent | 526f2bf5c534308193246e13ab2da8b3c0cf3cbb (diff) | |
| download | rust-2805e83dcb3762994b8802fa766c88ca93c5b839.tar.gz rust-2805e83dcb3762994b8802fa766c88ca93c5b839.zip | |
rustbuild: Skip generating docs if the config disables them.
It looks like before these config variables weren't actually taken into account. This patch should make the build system skip over the documentation steps correctly.
| -rw-r--r-- | src/bootstrap/build/step.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/bootstrap/build/step.rs b/src/bootstrap/build/step.rs index 80fcc32e537..c534a2c46bd 100644 --- a/src/bootstrap/build/step.rs +++ b/src/bootstrap/build/step.rs @@ -148,7 +148,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 @@ -350,7 +352,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)); } } |
