diff options
| author | bors <bors@rust-lang.org> | 2018-03-11 20:28:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-11 20:28:34 +0000 |
| commit | 178becdd7c86d87b24951af18e4b7d45f3e1e7bc (patch) | |
| tree | 838054469303a80d18bb5e2c80bd5f8d0b0c8b97 /src/bootstrap | |
| parent | 6c70cd149d3d5e568fc35cb58e4df728e14a567b (diff) | |
| parent | 994bfd414138e623f315f4273841b9f006ac72ee (diff) | |
| download | rust-178becdd7c86d87b24951af18e4b7d45f3e1e7bc.tar.gz rust-178becdd7c86d87b24951af18e4b7d45f3e1e7bc.zip | |
Auto merge of #48549 - alexcrichton:update-cargo, r=Mark-Simulacrum
Update Cargo submodule Hopefully a routine update...
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/builder.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 74b9978a837..1b74e7c41e7 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -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"); |