diff options
| author | bors <bors@rust-lang.org> | 2017-07-01 09:10:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-01 09:10:13 +0000 |
| commit | 7a2c09b6f5282335fc0000f5504fbed2f70e89c8 (patch) | |
| tree | 51c54db1895a48410cf869a701432e89e26a7d6f /src | |
| parent | d41b791c1af56b1f538cc6f77e597b7ad5b4d223 (diff) | |
| parent | 93528d90720c71892c24ea53d7a2467b8a335776 (diff) | |
| download | rust-7a2c09b6f5282335fc0000f5504fbed2f70e89c8.tar.gz rust-7a2c09b6f5282335fc0000f5504fbed2f70e89c8.zip | |
Auto merge of #42977 - Keruspe:master, r=alexcrichton
rustbuild: set __CARGO_DEFAULT_LIB_METADATA to channel Also, update the cargo submodule to handle the new value.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/lib.rs | 2 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 1 insertions, 1 deletions
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 @@ 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 -Subproject abf01e1eddb3145c83f71b469ea7bee37141e5e +Subproject d2d6e675fcb70cfb91c2cf2fad8cdd345c12031 |