From d23a62ba71c826b792db19dbf41ff4b70591fd7a Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Thu, 29 Jun 2017 10:03:56 +0200 Subject: [PATCH 1/2] rustbuild: set __CARGO_DEFAULT_LIB_METADATA to channel Signed-off-by: Marc-Antoine Perennou --- src/bootstrap/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index ce7cde8fc949..86180077b82f 100644 --- 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 { From 93528d90720c71892c24ea53d7a2467b8a335776 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Fri, 30 Jun 2017 09:38:13 +0200 Subject: [PATCH 2/2] update cargo submodule This brings in several fixes and the new handling of __CARGO_DEFAULT_LIB_METADATA Signed-off-by: Marc-Antoine Perennou --- src/tools/cargo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/cargo b/src/tools/cargo index abf01e1eddb3..d2d6e675fcb7 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit abf01e1eddb3145c83f71b469ea7bee37141e5e1 +Subproject commit d2d6e675fcb70cfb91c2cf2fad8cdd345c120316