|
|
|
|
From d8240c00ac455f22952a84b9febb80380d526a93 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
|
|
|
Date: Sat, 14 Jul 2018 09:32:07 +0200
|
|
|
|
|
Subject: [PATCH] build.rs: always use pkg-config
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
|
|
|
---
|
|
|
|
|
libssh2-sys/build.rs | 13 ++++---------
|
|
|
|
|
1 file changed, 4 insertions(+), 9 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/libssh2-sys/build.rs b/libssh2-sys/build.rs
|
|
|
|
|
index baff2397a7a9..a799ca030ded 100644
|
|
|
|
|
--- a/libssh2-sys/build.rs
|
|
|
|
|
+++ b/libssh2-sys/build.rs
|
|
|
|
|
@@ -14,16 +14,11 @@ fn main() {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- // The system copy of libssh2 is not used by default because it
|
|
|
|
|
- // can lead to having two copies of libssl loaded at once.
|
|
|
|
|
- // See https://github.com/alexcrichton/ssh2-rs/pull/88
|
|
|
|
|
- if env::var("LIBSSH2_SYS_USE_PKG_CONFIG").is_ok() {
|
|
|
|
|
- if let Ok(lib) = pkg_config::find_library("libssh2") {
|
|
|
|
|
- for path in &lib.include_paths {
|
|
|
|
|
- println!("cargo:include={}", path.display());
|
|
|
|
|
- }
|
|
|
|
|
- return
|
|
|
|
|
+ if let Ok(lib) = pkg_config::find_library("libssh2") {
|
|
|
|
|
+ for path in &lib.include_paths {
|
|
|
|
|
+ println!("cargo:include={}", path.display());
|
|
|
|
|
}
|
|
|
|
|
+ return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if !Path::new("libssh2/.git").exists() {
|
|
|
|
|
--
|
|
|
|
|
2.17.1
|
|
|
|
|
|
