Skip to content

Commit

Permalink
Merge pull request #1780 from sfackler/sfackler-patch-1
Browse files Browse the repository at this point in the history
Remove manual libatomic reference
  • Loading branch information
sfackler authored Jan 8, 2023
2 parents 8d3a54e + 32a303a commit 2c0c391
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions openssl-sys/build/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,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 2c0c391

Please sign in to comment.