about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Simulacrum <mark.simulacrum@gmail.com>2017-07-25 17:59:31 -0600
committerMark Simulacrum <mark.simulacrum@gmail.com>2017-07-27 05:51:23 -0600
commitcb27faf70fcb8666e108c453285176239b3f8db6 (patch)
tree7e1af257b10752ff46a7df2f4ecd712466261be8
parent3b905516106359201989d72615ade9ae9884d799 (diff)
downloadrust-cb27faf70fcb8666e108c453285176239b3f8db6.tar.gz
rust-cb27faf70fcb8666e108c453285176239b3f8db6.zip
Make sure CFG_RELEASE_CHANNEL is always set.
Previously we'd build libsyntax without it when documenting and that'd
cause us to recompile it when building normally for no reason.
-rw-r--r--src/bootstrap/builder.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 04730081e58..2f6e3ca9253 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -426,6 +426,7 @@ impl<'a> Builder<'a> {
                 self.sysroot(compiler)
             })
             .env("RUSTC_LIBDIR", self.sysroot_libdir(compiler, self.build.build))
+            .env("CFG_RELEASE_CHANNEL", &self.build.config.channel)
             .env("RUSTDOC_REAL", self.rustdoc(compiler));
         cmd
     }
@@ -574,6 +575,9 @@ impl<'a> Builder<'a> {
         // FIXME: should update code to not require this env var
         cargo.env("CFG_COMPILER_HOST_TRIPLE", target);
 
+        // Set this for all builds to make sure doc builds also get it.
+        cargo.env("CFG_RELEASE_CHANNEL", &self.build.config.channel);
+
         if self.is_verbose() {
             cargo.arg("-v");
         }