Skip to content

Fix vendored-openssl feature on macOS #719

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

Merged
merged 1 commit into from
Jun 7, 2021

Conversation

alexcrichton
Copy link
Member

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 #718

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
@alexcrichton alexcrichton merged commit b055a28 into rust-lang:master Jun 7, 2021
@alexcrichton alexcrichton deleted the fix-features branch June 7, 2021 14:38
@ehuss
Copy link
Contributor

ehuss commented Jun 7, 2021

Is there a particular reason that openssl-sys is excluded from macos here?

[target."cfg(all(unix, not(target_os = \"macos\")))".dependencies]

libgit2-sys does not have the same macos exclusion, so I believe it has no effect to have it.

@alexcrichton
Copy link
Member Author

Hm at this point it's probably historical for one reason or another, I don't recall the original reason but I would agree that it probably doesn't need to be present any more. (that being said it seemed fine to go ahead and add a vendored-openssl feature to libgit2-sys as well)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

vendored-openssl broken with new resolver
2 participants