From 4f661c016fe5cb015df1ba26baa9bafb76f51769 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 8 Oct 2018 10:39:09 -0700
Subject: 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.
---
 src/tools/rustc-workspace-hack/Cargo.toml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'src/tools/rustc-workspace-hack')

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']
-- 
cgit 1.4.1-3-g733a5