Unverified Commit 2c0c391f authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1780 from sfackler/sfackler-patch-1

Remove manual libatomic reference
parents 8d3a54e2 32a303a7
Loading
Loading
Loading
Loading
+0 −10
Original line number Diff line number Diff line
@@ -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");