user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #42977 - Keruspe:master, r=alexcrichton

Browse source 
rustbuild: set __CARGO_DEFAULT_LIB_METADATA to channel

Also, update the cargo submodule to handle the new value.
This commit is contained in:
bors 2017-07-01 09:10:13 +00:00
commit 7a2c09b6f5
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bootstrap/lib.rs
View file

@ -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 {

2
src/tools/cargo

@ -1 +1 @@
Subproject commit abf01e1eddb3145c83f71b469ea7bee37141e5e1
Subproject commit d2d6e675fcb70cfb91c2cf2fad8cdd345c120316