mirror of
https://github.com/cargo-bins/cargo-binstall.git
synced 2025-04-22 13:38:43 +00:00
Enable vendored native-tls if native-tls and static is enabled (#1832)
Fixed #1694 Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
parent
3f29fbe83a
commit
53f342ab1c
2 changed files with 19 additions and 1 deletions
11
Cargo.lock
generated
11
Cargo.lock
generated
|
@ -310,6 +310,7 @@ dependencies = [
|
||||||
"hickory-resolver",
|
"hickory-resolver",
|
||||||
"httpdate",
|
"httpdate",
|
||||||
"ipconfig",
|
"ipconfig",
|
||||||
|
"native-tls",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
"serde",
|
"serde",
|
||||||
|
@ -2922,6 +2923,15 @@ version = "0.1.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
|
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "openssl-src"
|
||||||
|
version = "300.3.1+3.3.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91"
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "openssl-sys"
|
name = "openssl-sys"
|
||||||
version = "0.9.103"
|
version = "0.9.103"
|
||||||
|
@ -2930,6 +2940,7 @@ checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc",
|
"cc",
|
||||||
"libc",
|
"libc",
|
||||||
|
"openssl-src",
|
||||||
"pkg-config",
|
"pkg-config",
|
||||||
"vcpkg",
|
"vcpkg",
|
||||||
]
|
]
|
||||||
|
|
|
@ -76,10 +76,16 @@ xz2 = "0.1.7"
|
||||||
# Otherwise there will be a link conflict.
|
# Otherwise there will be a link conflict.
|
||||||
zstd = { version = "0.13.2", default-features = false }
|
zstd = { version = "0.13.2", default-features = false }
|
||||||
|
|
||||||
|
[target."cfg(not(target_arch = \"wasm32\"))".dependencies.native-tls-crate]
|
||||||
|
optional = true
|
||||||
|
package = "native-tls"
|
||||||
|
# The version must be kept in sync of reqwest
|
||||||
|
version = "0.2.10"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = ["static", "rustls"]
|
default = ["static", "rustls"]
|
||||||
|
|
||||||
static = ["bzip2/static", "xz2/static"]
|
static = ["bzip2/static", "xz2/static", "native-tls-crate?/vendored"]
|
||||||
pkg-config = ["zstd/pkg-config"]
|
pkg-config = ["zstd/pkg-config"]
|
||||||
|
|
||||||
zlib-ng = ["flate2/zlib-ng"]
|
zlib-ng = ["flate2/zlib-ng"]
|
||||||
|
@ -104,6 +110,7 @@ rustls = [
|
||||||
]
|
]
|
||||||
native-tls = [
|
native-tls = [
|
||||||
"__tls",
|
"__tls",
|
||||||
|
"native-tls-crate",
|
||||||
"reqwest/native-tls",
|
"reqwest/native-tls",
|
||||||
"hickory-resolver?/dns-over-native-tls",
|
"hickory-resolver?/dns-over-native-tls",
|
||||||
]
|
]
|
||||||
|
|
Loading…
Add table
Reference in a new issue