From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Thu, 29 Jun 2017 08:03:56 +0000 (+0200)
Subject: rustbuild: set __CARGO_DEFAULT_LIB_METADATA to channel
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=d23a62ba71c826b792db19dbf41ff4b70591fd7a;p=rust.git

rustbuild: set __CARGO_DEFAULT_LIB_METADATA to channel

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
---

diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index ce7cde8fc94..86180077b82 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -347,7 +347,7 @@ fn cargo(&self,
 
         // 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 {