Skip to content

Commit

Permalink
Make sure CFG_RELEASE_CHANNEL is always set.
Browse files Browse the repository at this point in the history
Previously we'd build libsyntax without it when documenting and that'd
cause us to recompile it when building normally for no reason.
  • Loading branch information
Mark-Simulacrum committed Jul 27, 2017
1 parent 3b90551 commit cb27faf
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/bootstrap/builder.rs
Expand Up @@ -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
}
Expand Down Expand Up @@ -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");
}
Expand Down

0 comments on commit cb27faf

Please sign in to comment.