diff options
| author | Steven Fackler <[email protected]> | 2017-06-25 11:06:03 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-06-25 11:06:03 -0700 |
| commit | 026ed1fa0791ebf3e89450c70ce2d38c379c9ca5 (patch) | |
| tree | 751d28d452d6ee5a50b1d01da22003ed58ac1cbf | |
| parent | Merge pull request #654 from sfackler/pkey-private-key-from-der (diff) | |
| parent | Enable build on LibreSSL 5.6.0 development branch. (diff) | |
| download | rust-openssl-026ed1fa0791ebf3e89450c70ce2d38c379c9ca5.tar.xz rust-openssl-026ed1fa0791ebf3e89450c70ce2d38c379c9ca5.zip | |
Merge pull request #655 from ltratt/master
Enable build on LibreSSL 5.6.0 development branch.
| -rw-r--r-- | openssl-sys/build.rs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/openssl-sys/build.rs b/openssl-sys/build.rs index bd52d104..348c2f82 100644 --- a/openssl-sys/build.rs +++ b/openssl-sys/build.rs @@ -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"); |