rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Make sure CFG_RELEASE_CHANNEL is always set.

Browse Source 
Previously we'd build libsyntax without it when documenting and that'd
cause us to recompile it when building normally for no reason.
This commit is contained in:
Mark Simulacrum
2017-07-25 17:59:31 -06:00
parent 3b90551610
commit cb27faf70f
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bootstrap/builder.rs
View File

@@ -426,6 +426,7 @@ impl<'a> Builder<'a> {
self.sysroot(compiler) self.sysroot(compiler)
}) })
.env("RUSTC_LIBDIR", self.sysroot_libdir(compiler, self.build.build)) .env("RUSTC_LIBDIR", self.sysroot_libdir(compiler, self.build.build))
.env("CFG_RELEASE_CHANNEL", &self.build.config.channel)
.env("RUSTDOC_REAL", self.rustdoc(compiler)); .env("RUSTDOC_REAL", self.rustdoc(compiler));
cmd cmd
} }
@@ -574,6 +575,9 @@ impl<'a> Builder<'a> {
// FIXME: should update code to not require this env var // FIXME: should update code to not require this env var
cargo.env("CFG_COMPILER_HOST_TRIPLE", target); 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() { if self.is_verbose() {
cargo.arg("-v"); cargo.arg("-v");
} }