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.

Sign up for GitHub

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

Add a feature to build a vendored OpenSSL #5865

Merged
merged 1 commit into from
Aug 5, 2018
Merged

Add a feature to build a vendored OpenSSL #5865

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ toml = "0.4.2"
url = "1.1"
clap = "2.31.2"
unicode-width = "0.1.5"
openssl = { version = '0.10.11', optional = true }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does cargo currently pull in openssl itself, or just openssl-sys? You can depend on openssl-sys 0.9.35 and use its vendored feature alternatively.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like Cargo depends on crypto-hash which depends on openssl-the-crate, although openssl-sys is less likely to change over time so it may be best to depend on that anyway


# A noop dependency that changes in the Rust repository, it's a bit of a hack.
# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
Expand Down Expand Up @@ -95,3 +96,6 @@ bufstream = "0.1"
name = "cargo"
test = false
doc = false

[features]
vendored-openssl = ['openssl/vendored']