Commit 9d0b3d15 authored by Steven Fackler's avatar Steven Fackler
Browse files

Move BSD special case after pkg-config lookups

Also give a better error message if we couldn't find anything
parent 64287197
Loading
Loading
Loading
Loading
+14 −11
Original line number Diff line number Diff line
@@ -25,25 +25,28 @@ fn main() {
        return;
    }

    // pkg-config doesn't know of OpenSSL on FreeBSD 10.1 and OpenBSD uses LibreSSL
    if target.contains("bsd") {
        println!("cargo:rustc-flags=-l crypto -l ssl");
        // going to assume the base system includes a new version of openssl
    if pkg_config::Config::new().atleast_version("1.0.0").find("openssl").is_ok() {
        build_old_openssl_shim(false);
        return;
    }

    if pkg_config::Config::new().atleast_version("1.0.0").find("openssl").is_ok() {
        build_old_openssl_shim(false);
    let err = match pkg_config::find_library("openssl") {
        Ok(()) => {
            build_old_openssl_shim(true);
            return;
        }
        Err(err) => err,
    };

    if pkg_config::find_library("openssl").is_ok() {
        build_old_openssl_shim(true);
    // pkg-config doesn't know of OpenSSL on FreeBSD 10.1 and OpenBSD uses LibreSSL
    if target.contains("bsd") {
        println!("cargo:rustc-flags=-l crypto -l ssl");
        // going to assume the base system includes a new version of openssl
        build_old_openssl_shim(false);
        return;
    }

    panic!("Unable to find openssl libraries");
    panic!("unable to find openssl: {}", err);
}

fn build_old_openssl_shim(is_old: bool) {