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

Merge pull request #1925 from amousset/openssl-3 

Update vendored version to openssl 3
parents 2d7c86ca ddd04786

openssl-sys/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 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 = "111", optional = true }

openssl-src = { version = "300.1.2", optional = true, features = ["legacy"] }

pkg-config = "0.3.9"

vcpkg = "0.2.8"

openssl-sys/build/main.rs

+10 −0
Original line number Diff line number Diff line
@@ -115,6 +115,16 @@ 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");