Merge pull request #199 from sagudev/patch-2

Do not check pkg-config when cross-compiling for android

build.rs

@@ -22,6 +22,14 @@ fn main() {
         return build_zlib_ng(&target, true);
     }
 
+    // All android compilers should come with libz by default, so let's just use
+    // the one already there. Likewise, Haiku always ships with libz, so we can
+    // link to it even when cross-compiling.
+    if target.contains("android") || target.contains("haiku") {
+        println!("cargo:rustc-link-lib=z");
+        return;
+    }
+
     // Don't run pkg-config if we're linking statically (we'll build below) and
     // also don't run pkg-config on FreeBSD/DragonFly. That'll end up printing
     // `-L /usr/lib` which wreaks havoc with linking to an OpenSSL in /usr/local/lib
@@ -63,14 +71,6 @@ fn main() {
         }
     }
 
-    // All android compilers should come with libz by default, so let's just use
-    // the one already there. Likewise, Haiku always ships with libz, so we can
-    // link to it even when cross-compiling.
-    if target.contains("android") || target.contains("haiku") {
-        println!("cargo:rustc-link-lib=z");
-        return;
-    }
-
     let mut cfg = cc::Build::new();
 
     // Situations where we build unconditionally.