diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-11-09 12:55:25 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2018-11-09 12:59:05 -0800 |
| commit | 62d78010a9d364bb21be0c4fe218d22ae9fb3294 (patch) | |
| tree | 137388d7bbd326101925b475a07266d5bbfee36c /src/tools | |
| parent | 36a50c29f6c5c386fba6ab685818755ac55152e5 (diff) | |
| download | rust-62d78010a9d364bb21be0c4fe218d22ae9fb3294.tar.gz | |
Update Cargo submodule
Hopefully a relatively routine update!
Diffstat (limited to 'src/tools')
| m--------- | src/tools/cargo | 0 | ||||
| -rw-r--r-- | src/tools/rustc-workspace-hack/Cargo.toml | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 1fa30882067703202d13ad0bd53d630bc2c1de6 +Subproject 241fac0e3933063fa48a1a01f5d577e40af12e4 diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index ee14c62df30..f2b08f8e0bb 100644 --- a/src/tools/rustc-workspace-hack/Cargo.toml +++ b/src/tools/rustc-workspace-hack/Cargo.toml @@ -59,4 +59,4 @@ openssl = { version = "0.10.12", optional = true } [features] -all-static = ['openssl/vendored', 'curl-sys/static-curl'] +all-static = ['openssl/vendored', 'curl-sys/static-curl', 'curl-sys/force-system-lib-on-osx'] |