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.
31 lines
887 B
31 lines
887 B
7 years ago
|
From b5fcfdab05bbea12872e445517e16ec0e79f2803 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>
|
||
|
|
---
|
||
|
|
libgit2-sys/build.rs | 6 ++----
|
||
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/libgit2-sys/build.rs b/libgit2-sys/build.rs
|
||
|
|
index c7545c2..b7aefcf 100644
|
||
|
|
--- a/libgit2-sys/build.rs
|
||
|
|
+++ b/libgit2-sys/build.rs
|
||
|
|
@@ -31,10 +31,8 @@ fn main() {
|
||
|
|
}
|
||
|
|
let has_pkgconfig = Command::new("pkg-config").output().is_ok();
|
||
|
|
|
||
|
|
- if env::var("LIBGIT2_SYS_USE_PKG_CONFIG").is_ok() {
|
||
|
|
- if pkg_config::find_library("libgit2").is_ok() {
|
||
|
|
- return
|
||
|
|
- }
|
||
|
|
+ if pkg_config::find_library("libgit2").is_ok() {
|
||
|
|
+ return
|
||
|
|
}
|
||
|
|
|
||
|
|
if !Path::new("libgit2/.git").exists() {
|
||
|
|
--
|
||
|
|
2.15.0
|
||
|
|
|