Commit 026ed1fa authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #655 from ltratt/master 

Enable build on LibreSSL 5.6.0 development branch.
parents 7427dd72 aa5547cd

openssl-sys/build.rs

+9 −1
Original line number Diff line number Diff line
@@ -237,8 +237,10 @@ fn validate_headers(include_dirs: &[PathBuf]) -> Version { 
#include <openssl/opensslv.h>

#include <openssl/opensslconf.h>



#if LIBRESSL_VERSION_NUMBER >= 0x20505000

#if LIBRESSL_VERSION_NUMBER >= 0x20601000

RUST_LIBRESSL_NEW

#elif LIBRESSL_VERSION_NUMBER >= 0x20600000

RUST_LIBRESSL_260

#elif LIBRESSL_VERSION_NUMBER >= 0x20504000

RUST_LIBRESSL_254

#elif LIBRESSL_VERSION_NUMBER >= 0x20503000
@@ -350,6 +352,12 @@ See rust-openssl README for more information: 
        println!("cargo:libressl=true");

        println!("cargo:version=101");

        Version::Libressl

    } else if expanded.contains("RUST_LIBRESSL_260") {

        println!("cargo:rustc-cfg=libressl");

        println!("cargo:rustc-cfg=libressl260");

        println!("cargo:libressl=true");

        println!("cargo:version=101");

        Version::Libressl

    } else if expanded.contains("RUST_OPENSSL_110F") {

        println!("cargo:rustc-cfg=ossl110");

        println!("cargo:rustc-cfg=ossl110f");