diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-10-08 10:39:09 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2018-10-20 18:47:01 -0700 |
| commit | 4f661c016fe5cb015df1ba26baa9bafb76f51769 (patch) | |
| tree | 4d416a9dde6c8e855234973414195287d1532e09 /src/tools/rustc-workspace-hack | |
| parent | d5418764ada3ce7b308de7a0e6e260548a635afc (diff) | |
| download | rust-4f661c016fe5cb015df1ba26baa9bafb76f51769.tar.gz | |
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/tools/rustc-workspace-hack')
| -rw-r--r-- | src/tools/rustc-workspace-hack/Cargo.toml | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index 77ffe41d7f6..ee14c62df30 100644 --- a/src/tools/rustc-workspace-hack/Cargo.toml +++ b/src/tools/rustc-workspace-hack/Cargo.toml @@ -39,6 +39,7 @@ features = [ "schannel", "securitybaseapi", "shellapi", + "sspi", "synchapi", "sysinfoapi", "timezoneapi", @@ -48,10 +49,14 @@ features = [ "wincrypt", ] -[dependencies.serde_json] -version = "1.0.31" -features = ["raw_value"] +[dependencies] +serde_json = { version = "1.0.31", features = ["raw_value"] } +rand = { version = "0.5.5", features = ["i128_support"] } +curl-sys = { version = "0.4.13", optional = true } -[dependencies.rand] -version = "0.5.5" -features = ["i128_support"] +[target.'cfg(not(windows))'.dependencies] +openssl = { version = "0.10.12", optional = true } + + +[features] +all-static = ['openssl/vendored', 'curl-sys/static-curl'] |