Skip to content

Commit 7a18839

Browse files
committed
Build with test openssl-src
1 parent ddd0478 commit 7a18839

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

openssl-sys/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ 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 = "300.1.2", optional = true, features = ["legacy"] }
28+
openssl-src = { git = "https://github.com/amousset/openssl-src-rs", rev = "0bfc809637965b94ac4b20221083b2b8782e4c02", optional = true, features = ["legacy"] }
29+
#openssl-src = { version = "300.1.2", optional = true, features = ["legacy"] }
2930
pkg-config = "0.3.9"
3031
vcpkg = "0.2.8"
3132

openssl-sys/build/main.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,16 +115,6 @@ 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-
128118
if kind == "static" && target.contains("windows") {
129119
println!("cargo:rustc-link-lib=dylib=gdi32");
130120
println!("cargo:rustc-link-lib=dylib=user32");

0 commit comments

Comments
 (0)