Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid unconditional dependency on libssh2-sys when using zlib-ng-compat #833

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 1 addition & 6 deletions libgit2-sys/Cargo.toml
Expand Up @@ -38,9 +38,4 @@ https = ["openssl-sys"]
ssh_key_from_memory = []
vendored = []
vendored-openssl = ["openssl-sys/vendored"]
# Cargo does not support requiring features on an optional dependency without
# requiring the dependency. Rather than introduce additional complexity, we
# just require libssh2 when using zlib-ng-compat. This will require building
# libssh2, but it will not add code to the final binary without the "ssh"
# feature enabled.
zlib-ng-compat = ["libz-sys/zlib-ng", "libssh2-sys/zlib-ng-compat"]
zlib-ng-compat = ["libz-sys/zlib-ng", "libssh2-sys?/zlib-ng-compat"]