Auto merge of #48549 - alexcrichton:update-cargo, r=Mark-Simulacrum

Update Cargo submodule

Hopefully a routine update...
This commit is contained in:
bors
2018-03-11 20:28:34 +00:00
17 changed files with 680 additions and 748 deletions

View File

@@ -759,7 +759,9 @@ impl<'a> Builder<'a> {
// be resolved because MinGW has the import library. The downside is we
// don't get newer functions from Windows, but we don't use any of them
// anyway.
cargo.env("WINAPI_NO_BUNDLED_LIBRARIES", "1");
if mode != Mode::Tool {
cargo.env("WINAPI_NO_BUNDLED_LIBRARIES", "1");
}
if self.is_very_verbose() {
cargo.arg("-v");