min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve buildscript logic

This commit is contained in:
Steven Fackler 2016-11-04 21:08:34 -07:00
parent 1108db74ec
commit 9198bcda3a
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openssl-sys/build.rs
View File

@ -219,13 +219,13 @@ fn validate_headers(include_dirs: &[PathBuf],
}; };
if version_text.contains("0x10001") { if version_text.contains("0x10001") {
println!("cargo:rustc-cfg=ossl101"); println!("cargo:rustc-cfg=ossl101");
println!("cargo:is_101=1"); println!("cargo:version=101");
} else if version_text.contains("0x10002") { } else if version_text.contains("0x10002") {
println!("cargo:rustc-cfg=ossl102"); println!("cargo:rustc-cfg=ossl102");
println!("cargo:is_102=1"); println!("cargo:version=102");
} else if version_text.contains("0x10100") { } else if version_text.contains("0x10100") {
println!("cargo:rustc-cfg=ossl110"); println!("cargo:rustc-cfg=ossl110");
println!("cargo:is_110=1"); println!("cargo:version=110");
} else { } else {
panic!(" panic!("

25
openssl/build.rs
View File

@ -1,18 +1,19 @@
use std::env; use std::env;
fn main() { fn main() {
if env::var("DEP_OPENSSL_IS_110").is_ok() { match env::var("DEP_OPENSSL_VERSION") {
println!("cargo:rustc-cfg=ossl110"); Ok(ref v) if v == "101" => {
return; println!("cargo:rustc-cfg=ossl101");
} else if env::var("DEP_OPENSSL_IS_102").is_ok() { println!("cargo:rustc-cfg=ossl10x");
println!("cargo:rustc-cfg=ossl102"); }
println!("cargo:rustc-cfg=ossl10x"); Ok(ref v) if v == "102" => {
return; println!("cargo:rustc-cfg=ossl102");
} else if env::var("DEP_OPENSSL_IS_101").is_ok() { println!("cargo:rustc-cfg=ossl10x");
println!("cargo:rustc-cfg=ossl101"); }
println!("cargo:rustc-cfg=ossl10x"); Ok(ref v) if v == "110" => {
} else { println!("cargo:rustc-cfg=ossl110");
panic!("Unable to detect OpenSSL version"); }
_ => panic!("Unable to detect OpenSSL version"),
} }
if let Ok(vars) = env::var("DEP_OPENSSL_OSSLCONF") { if let Ok(vars) = env::var("DEP_OPENSSL_OSSLCONF") {