Unverified Commit 22a66be9 authored by Alex Gaynor's avatar Alex Gaynor Committed by GitHub
Browse files

Merge pull request #2284 from kornelski/cargo-warnings 

Ensure beginning and end of the error output is readable
parents a94ccf2e eeb920f8

openssl-sys/build/find_normal.rs

+16 −6
Original line number Diff line number Diff line
@@ -102,13 +102,21 @@ fn find_openssl_dir(target: &str) -> OsString { 
        return OsString::from("/usr/local");

    }



    let msg_header =

        "Could not find directory of OpenSSL installation, and this `-sys` crate cannot

proceed without this knowledge. If OpenSSL is installed and this crate had

trouble finding it,  you can set the `OPENSSL_DIR` environment variable for the

compilation process.";



    println!(

        "cargo:warning={} See stderr section below for further information.",

        msg_header.replace('\n', " ")

    );



    let mut msg = format!(

        "



Could not find directory of OpenSSL installation, and this `-sys` crate cannot

proceed without this knowledge. If OpenSSL is installed and this crate had

trouble finding it,  you can set the `OPENSSL_DIR` environment variable for the

compilation process.

{}



Make sure you also have the development packages of openssl installed.

For example, `libssl-dev` on Ubuntu or `openssl-devel` on Fedora.
@@ -122,6 +130,7 @@ $TARGET = {} 
openssl-sys = {}



",

        msg_header,

        host,

        target,

        env!("CARGO_PKG_VERSION")
@@ -187,7 +196,8 @@ https://github.com/sfackler/rust-openssl#windows 
        );

    }



    panic!("{}", msg);

    eprintln!("{}", msg);

    std::process::exit(101); // same as panic previously

}



/// Attempt to find OpenSSL through pkg-config.
@@ -212,7 +222,7 @@ fn try_pkg_config() { 
    {

        Ok(lib) => lib,

        Err(e) => {

            println!("run pkg_config fail: {:?}", e);

            println!("\n\nCould not find openssl via pkg-config:\n{}\n", e);

            return;

        }

    };