From cb27faf70fcb8666e108c453285176239b3f8db6 Mon Sep 17 00:00:00 2001 From: Mark Simulacrum Date: Tue, 25 Jul 2017 17:59:31 -0600 Subject: [PATCH] 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. --- src/bootstrap/builder.rs | 4 ++++ 1 file changed, 4 insertions(+) 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 @@ pub fn rustdoc_cmd(&self, compiler: Compiler) -> Command { 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 @@ pub fn cargo(&self, // 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"); } -- GitLab