Auto merge of #43022 - Keruspe:beta, r=alexcrichton

[beta] rustbuild: set __CARGO_DEFAULT_LIB_METADATA to channel This is a backport of #42977 for beta
rust-lang · Jul 4, 2017 · c064c87 · c064c87
2 parents 3cbe8f9 + 427cbbc
commit c064c87
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
@@ -347,7 +347,7 @@ impl Build {
 
         // FIXME: Temporary fix for https://github.com/rust-lang/cargo/issues/3005
         // Force cargo to output binaries with disambiguating hashes in the name
-        cargo.env("__CARGO_DEFAULT_LIB_METADATA", "1");
+        cargo.env("__CARGO_DEFAULT_LIB_METADATA", &self.config.channel);
 
         let stage;
         if compiler.stage == 0 && self.local_rebuild {

diff --git a/src/tools/cargo b/src/tools/cargo