Skip to content

Commit

Permalink
Build with test openssl-src
Browse files Browse the repository at this point in the history
  • Loading branch information
amousset committed Jul 23, 2023
1 parent ddd0478 commit 7a18839
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
3 changes: 2 additions & 1 deletion openssl-sys/Cargo.toml
Expand Up @@ -25,7 +25,8 @@ bssl-sys = { version = "0.1.0", optional = true }
[build-dependencies]
bindgen = { version = "0.64.0", optional = true, features = ["experimental"] }
cc = "1.0.61"
openssl-src = { version = "300.1.2", optional = true, features = ["legacy"] }
openssl-src = { git = "https://github.com/amousset/openssl-src-rs", rev = "0bfc809637965b94ac4b20221083b2b8782e4c02", optional = true, features = ["legacy"] }
#openssl-src = { version = "300.1.2", optional = true, features = ["legacy"] }
pkg-config = "0.3.9"
vcpkg = "0.2.8"

Expand Down
10 changes: 0 additions & 10 deletions openssl-sys/build/main.rs
Expand Up @@ -115,16 +115,6 @@ fn main() {
println!("cargo:rustc-link-lib={}={}", kind, lib);
}

// https://github.com/openssl/openssl/pull/15086
if version == Version::Openssl3xx
&& kind == "static"
&& (env::var("CARGO_CFG_TARGET_OS").unwrap() == "linux"
|| env::var("CARGO_CFG_TARGET_OS").unwrap() == "android")
&& env::var("CARGO_CFG_TARGET_POINTER_WIDTH").unwrap() == "32"
{
println!("cargo:rustc-link-lib=dylib=atomic");
}

if kind == "static" && target.contains("windows") {
println!("cargo:rustc-link-lib=dylib=gdi32");
println!("cargo:rustc-link-lib=dylib=user32");
Expand Down

0 comments on commit 7a18839

Please sign in to comment.