diff options
author | Alex Crichton <alex@alexcrichton.com> | 2016-11-09 08:10:03 -0800 |
---|---|---|
committer | Alex Crichton <alex@alexcrichton.com> | 2016-11-09 08:10:03 -0800 |
commit | 2a1cd431885818cd62aa4ea6fe79e08f0ed8298e (patch) | |
tree | dc5680f05faac9f871d3ae9796035393a00eda70 | |
parent | 4e3e6c224702755dfdc8ee7a4b443ad580dc498e (diff) | |
download | ssh2-rs-2a1cd431885818cd62aa4ea6fe79e08f0ed8298e.zip |
Read INCLUDE vars as well as ROOT
Help update for openssl-sys crate release
-rw-r--r-- | libssh2-sys/build.rs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libssh2-sys/build.rs b/libssh2-sys/build.rs index dbcffab..904d21d 100644 --- a/libssh2-sys/build.rs +++ b/libssh2-sys/build.rs @@ -96,11 +96,16 @@ fn main() { } fn register_dep(dep: &str) { - match env::var(&format!("DEP_{}_ROOT", dep)) { - Ok(s) => { - prepend("PKG_CONFIG_PATH", Path::new(&s).join("lib/pkgconfig")); + if let Some(s) = env::var_os(&format!("DEP_{}_ROOT", dep)) { + prepend("PKG_CONFIG_PATH", Path::new(&s).join("lib/pkgconfig")); + return + } + if let Some(s) = env::var_os(&format!("DEP_{}_INCLUDE", dep)) { + let path = Path::new(&s).join("../lib/pkgconfig"); + if path.exists() { + prepend("PKG_CONFIG_PATH", path); + return } - Err(..) => {} } } |