You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
39 lines
1.3 KiB
39 lines
1.3 KiB
From d887c34ce5ec0d3b4228cf0f88e970f586abc845 Mon Sep 17 00:00:00 2001
|
|
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
Date: Sun, 26 Nov 2017 12:22:51 +0100
|
|
Subject: [PATCH] build.rs: always use pkg-config
|
|
|
|
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
Signed-off-by: Josh Stone <jistone@redhat.com>
|
|
---
|
|
libgit2-sys/build.rs | 12 +++++-------
|
|
1 file changed, 5 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/libgit2-sys/build.rs b/libgit2-sys/build.rs
|
|
index cc76cd46b3b3..45c6ed61280d 100644
|
|
--- a/libgit2-sys/build.rs
|
|
+++ b/libgit2-sys/build.rs
|
|
@@ -10,14 +10,12 @@ fn main() {
|
|
let https = env::var("CARGO_FEATURE_HTTPS").is_ok();
|
|
let ssh = env::var("CARGO_FEATURE_SSH").is_ok();
|
|
|
|
- if env::var("LIBGIT2_SYS_USE_PKG_CONFIG").is_ok() {
|
|
- let mut cfg = pkg_config::Config::new();
|
|
- if let Ok(lib) = cfg.atleast_version("0.28.0").probe("libgit2") {
|
|
- for include in &lib.include_paths {
|
|
- println!("cargo:root={}", include.display());
|
|
- }
|
|
- return
|
|
+ let mut cfg = pkg_config::Config::new();
|
|
+ if let Ok(lib) = cfg.atleast_version("0.28.0").probe("libgit2") {
|
|
+ for include in &lib.include_paths {
|
|
+ println!("cargo:root={}", include.display());
|
|
}
|
|
+ return
|
|
}
|
|
|
|
if !Path::new("libgit2/.git").exists() {
|
|
--
|
|
2.21.0
|
|
|