Skip to content

Commit

Permalink
Auto merge of #11979 - weihanglo:openssl-for-non-windows, r=ehuss
Browse files Browse the repository at this point in the history
chore: use openssl only on non-Windows platforms

On Windows, the system-provided Schannel will be used instead.

See

- rust-lang/rust#109133 (comment)
- https://github.com/rust-lang/cargo/blob/39116ccc9b420a883a98a960f0597f9cf87414b8/README.md?plain=1#L38-L49
  • Loading branch information
bors committed Apr 16, 2023
2 parents 39116cc + a0bb59c commit d0a4cbc
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ libgit2-sys = "0.15.0"
log = "0.4.6"
memchr = "2.1.3"
opener = "0.5"
openssl = { version = '0.10.11', optional = true }
os_info = "3.5.0"
pasetors = { version = "0.6.4", features = ["v3", "paserk", "std", "serde"] }
pathdiff = "0.2"
Expand All @@ -100,6 +99,9 @@ unicode-xid = "0.2.0"
url = "2.2.2"
walkdir = "2.2"

[target.'cfg(not(windows))'.dependencies]
openssl = { version = "0.10.50", optional = true }

[target.'cfg(windows)'.dependencies]
fwdansi = "1.1.0"

Expand Down

0 comments on commit d0a4cbc

Please sign in to comment.