Unverified Commit 66635f10 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1556 from ValHeimer/patch-1 

Also link to libatomic for android static 32 bit 3.0.0 builds
parents 0e508cb0 44c8d9c7

openssl-sys/build/main.rs

+2 −1
Original line number Diff line number Diff line
@@ -111,7 +111,8 @@ fn main() { 
    // 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() == "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");