diff options
| author | Steven Fackler <[email protected]> | 2017-11-13 21:51:55 -0800 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2017-11-13 21:51:55 -0800 |
| commit | 55bf390dbea0914a128f1e4d2f3808420da3be87 (patch) | |
| tree | 99fb67da55cad2d3c80cdce1bcb6419960923987 /openssl-sys/build.rs | |
| parent | Remove libressl 2.6.2 build (diff) | |
| download | rust-openssl-55bf390dbea0914a128f1e4d2f3808420da3be87.tar.xz rust-openssl-55bf390dbea0914a128f1e4d2f3808420da3be87.zip | |
Adjust libressl version detection
The 2.5.3+ and 2.6.3+ series are ABI-stable, so we don't need to
whitelist individual releases in those ranges.
Diffstat (limited to 'openssl-sys/build.rs')
| -rw-r--r-- | openssl-sys/build.rs | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/openssl-sys/build.rs b/openssl-sys/build.rs index b0163834..ff875be5 100644 --- a/openssl-sys/build.rs +++ b/openssl-sys/build.rs @@ -316,24 +316,18 @@ fn validate_headers(include_dirs: &[PathBuf]) -> Version { #include <openssl/opensslv.h> #include <openssl/opensslconf.h> -#if LIBRESSL_VERSION_NUMBER >= 0x20604000 +#if LIBRESSL_VERSION_NUMBER >= 0x20700000 RUST_LIBRESSL_NEW #elif LIBRESSL_VERSION_NUMBER >= 0x20603000 -RUST_LIBRESSL_263 +RUST_LIBRESSL_26X #elif LIBRESSL_VERSION_NUMBER >= 0x20602000 RUST_LIBRESSL_262 #elif LIBRESSL_VERSION_NUMBER >= 0x20601000 RUST_LIBRESSL_261 #elif LIBRESSL_VERSION_NUMBER >= 0x20600000 RUST_LIBRESSL_260 -#elif LIBRESSL_VERSION_NUMBER >= 0x20506000 -RUST_LIBRESSL_NEW -#elif LIBRESSL_VERSION_NUMBER >= 0x20505000 -RUST_LIBRESSL_255 -#elif LIBRESSL_VERSION_NUMBER >= 0x20504000 -RUST_LIBRESSL_254 #elif LIBRESSL_VERSION_NUMBER >= 0x20503000 -RUST_LIBRESSL_253 +RUST_LIBRESSL_25X #elif LIBRESSL_VERSION_NUMBER >= 0x20502000 RUST_LIBRESSL_252 #elif LIBRESSL_VERSION_NUMBER >= 0x20501000 @@ -435,25 +429,11 @@ See rust-openssl README for more information: println!("cargo:libressl_version=252"); println!("cargo:version=101"); Version::Libressl - } else if expanded.contains("RUST_LIBRESSL_253") { - println!("cargo:rustc-cfg=libressl"); - println!("cargo:rustc-cfg=libressl253"); - println!("cargo:libressl=true"); - println!("cargo:libressl_version=253"); - println!("cargo:version=101"); - Version::Libressl - } else if expanded.contains("RUST_LIBRESSL_254") { - println!("cargo:rustc-cfg=libressl"); - println!("cargo:rustc-cfg=libressl254"); - println!("cargo:libressl=true"); - println!("cargo:libressl_version=254"); - println!("cargo:version=101"); - Version::Libressl - } else if expanded.contains("RUST_LIBRESSL_255") { + } else if expanded.contains("RUST_LIBRESSL_25X") { println!("cargo:rustc-cfg=libressl"); - println!("cargo:rustc-cfg=libressl255"); + println!("cargo:rustc-cfg=libressl25x"); println!("cargo:libressl=true"); - println!("cargo:libressl_version=255"); + println!("cargo:libressl_version=25x"); println!("cargo:version=101"); Version::Libressl } else if expanded.contains("RUST_LIBRESSL_260") { @@ -477,11 +457,11 @@ See rust-openssl README for more information: println!("cargo:libressl_version=262"); println!("cargo:version=101"); Version::Libressl - } else if expanded.contains("RUST_LIBRESSL_263") { + } else if expanded.contains("RUST_LIBRESSL_26X") { println!("cargo:rustc-cfg=libressl"); - println!("cargo:rustc-cfg=libressl263"); + println!("cargo:rustc-cfg=libressl26x"); println!("cargo:libressl=true"); - println!("cargo:libressl_version=263"); + println!("cargo:libressl_version=26x"); println!("cargo:version=101"); Version::Libressl } else if expanded.contains("RUST_OPENSSL_110F") { |