Skip to content

Commit ddd0478

Browse files
committed
Update vendored openssl to version 3.1
1 parent 50787ed commit ddd0478

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

openssl-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ bssl-sys = { version = "0.1.0", optional = true }
2525
[build-dependencies]
2626
bindgen = { version = "0.64.0", optional = true, features = ["experimental"] }
2727
cc = "1.0.61"
28-
openssl-src = { version = "111", optional = true }
28+
openssl-src = { version = "300.1.2", optional = true, features = ["legacy"] }
2929
pkg-config = "0.3.9"
3030
vcpkg = "0.2.8"
3131

openssl-sys/build/main.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,16 @@ fn main() {
115115
println!("cargo:rustc-link-lib={}={}", kind, lib);
116116
}
117117

118+
// https://github.com/openssl/openssl/pull/15086
119+
if version == Version::Openssl3xx
120+
&& kind == "static"
121+
&& (env::var("CARGO_CFG_TARGET_OS").unwrap() == "linux"
122+
|| env::var("CARGO_CFG_TARGET_OS").unwrap() == "android")
123+
&& env::var("CARGO_CFG_TARGET_POINTER_WIDTH").unwrap() == "32"
124+
{
125+
println!("cargo:rustc-link-lib=dylib=atomic");
126+
}
127+
118128
if kind == "static" && target.contains("windows") {
119129
println!("cargo:rustc-link-lib=dylib=gdi32");
120130
println!("cargo:rustc-link-lib=dylib=user32");

0 commit comments

Comments
 (0)