diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-02-26 09:07:16 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2018-03-11 10:59:28 -0700 |
| commit | 994bfd414138e623f315f4273841b9f006ac72ee (patch) | |
| tree | 55d54030a429044706fae052c2d72e857d8320f5 /src/bootstrap | |
| parent | fedce67cd21dc08ece5a484fe1a060346acac98a (diff) | |
| download | rust-994bfd414138e623f315f4273841b9f006ac72ee.tar.gz rust-994bfd414138e623f315f4273841b9f006ac72ee.zip | |
Update Cargo submodule
Required moving all fulldeps tests depending on `rand` to different locations as now there's multiple `rand` crates that can't be implicitly linked against.
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 22656e5a9da..586216b9a58 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -775,7 +775,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"); |