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

Move BSD special case after pkg-config lookups 

Also give a better error message if we couldn't find anything
This commit is contained in:
Steven Fackler 2015-02-12 09:23:46 -08:00
parent 64287197a2
commit 9d0b3d1574
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
openssl-sys/build.rs
View File

@ -25,6 +25,19 @@ fn main() {
return; return;
} }
if pkg_config::Config::new().atleast_version("1.0.0").find("openssl").is_ok() {
build_old_openssl_shim(false);
return;
}
let err = match pkg_config::find_library("openssl") {
Ok(()) => {
build_old_openssl_shim(true);
return;
}
Err(err) => err,
};
// pkg-config doesn't know of OpenSSL on FreeBSD 10.1 and OpenBSD uses LibreSSL // pkg-config doesn't know of OpenSSL on FreeBSD 10.1 and OpenBSD uses LibreSSL
if target.contains("bsd") { if target.contains("bsd") {
println!("cargo:rustc-flags=-l crypto -l ssl"); println!("cargo:rustc-flags=-l crypto -l ssl");
@ -33,17 +46,7 @@ fn main() {
return; return;
} }
if pkg_config::Config::new().atleast_version("1.0.0").find("openssl").is_ok() { panic!("unable to find openssl: {}", err);
build_old_openssl_shim(false);
return;
}
if pkg_config::find_library("openssl").is_ok() {
build_old_openssl_shim(true);
return;
}
panic!("Unable to find openssl libraries");
} }
fn build_old_openssl_shim(is_old: bool) { fn build_old_openssl_shim(is_old: bool) {