diff options
| author | bors <bors@rust-lang.org> | 2018-10-21 06:48:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-10-21 06:48:10 +0000 |
| commit | 554b7874a9f720d1a1e83958f3137da4c8f3f33b (patch) | |
| tree | 4d416a9dde6c8e855234973414195287d1532e09 /src/test/parse-fail/trait-object-trait-parens.rs | |
| parent | d5418764ada3ce7b308de7a0e6e260548a635afc (diff) | |
| parent | 4f661c016fe5cb015df1ba26baa9bafb76f51769 (diff) | |
| download | rust-554b7874a9f720d1a1e83958f3137da4c8f3f33b.tar.gz rust-554b7874a9f720d1a1e83958f3137da4c8f3f33b.zip | |
Auto merge of #54919 - alexcrichton:update-cargo, r=Mark-Simulacrum
Update Cargo, build curl/OpenSSL statically via features In addition to to updating Cargo's submodule and Cargo's dependencies, this also updates Cargo's build to build OpenSSL statically into Cargo as well as libcurl unconditionally. This removes OpenSSL build logic from the bootstrap code, and otherwise requests that even on OSX we build curl statically.
Diffstat (limited to 'src/test/parse-fail/trait-object-trait-parens.rs')
0 files changed, 0 insertions, 0 deletions