Skip to content

Commit b055a28

Browse files
authored
Fix vendored-openssl feature on macOS (rust-lang#719)
Turns out the git2 dependency on openssl-sys was conditional to happen everywhere but macOS, which means that vendored-openssl didn't work. The fix here is to forward the feature to the `libgit2-sys` crate which depends on `openssl-sys` even on macOS. Closes rust-lang#718
1 parent a6ea3e2 commit b055a28

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ unstable = []
3838
default = ["ssh", "https", "ssh_key_from_memory"]
3939
ssh = ["libgit2-sys/ssh"]
4040
https = ["libgit2-sys/https", "openssl-sys", "openssl-probe"]
41-
vendored-openssl = ["openssl-sys/vendored"]
41+
vendored-openssl = ["openssl-sys/vendored", "libgit2-sys/vendored-openssl"]
4242
ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"]
4343
zlib-ng-compat = ["libgit2-sys/zlib-ng-compat"]
4444

libgit2-sys/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ openssl-sys = { version = "0.9", optional = true }
3636
ssh = ["libssh2-sys"]
3737
https = ["openssl-sys"]
3838
ssh_key_from_memory = []
39+
vendored-openssl = ["openssl-sys/vendored"]
3940
# Cargo does not support requiring features on an optional dependency without
4041
# requiring the dependency. Rather than introduce additional complexity, we
4142
# just require libssh2 when using zlib-ng-compat. This will require building

0 commit comments

Comments
 (0)