From: Ximin Luo <infinity0@debian.org>
Date: Fri, 9 Mar 2018 15:39:38 +0000 (+0530)
Subject: Always use system libgit2
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2^2~1^2~1^2^2^2^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ece8a47cef95dec1597c32f489217b42a0ef031a;p=cargo.git

Always use system libgit2

Forwarded: not-needed

Gbp-Pq: Name 2001_use-system-libgit2.patch
---

diff --git a/vendor/libgit2-sys-0.6.19/build.rs b/vendor/libgit2-sys-0.6.19/build.rs
index c7545c2eb..c46a6786d 100644
--- a/vendor/libgit2-sys-0.6.19/build.rs
+++ b/vendor/libgit2-sys-0.6.19/build.rs
@@ -31,12 +31,11 @@ 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() {
         let _ = Command::new("git").args(&["submodule", "update", "--init"])
                                    .status();