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

bors · bors · commit c064c879dbdc · 2017-07-04T10:52:10.000Z
[beta] rustbuild: set __CARGO_DEFAULT_LIB_METADATA to channel This is a backport of #42977 for beta
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
@@ -1 +1 @@
-Subproject commit c9bdd3e9bd77debf4715a074ee90d19f5551000e
+Subproject commit bff2d2a2024ab6b5016b791b47500de550e1a41d
