Merge pull request #214 from jgallagher/skip-linking-usr-lib-explicitly

Skip linking /usr/lib explicitly

Cargo.toml

@@ -40,7 +40,7 @@ regex = "~0.2"
 
 [dependencies.libsqlite3-sys]
 path = "libsqlite3-sys"
-version = "0.6.0"
+version = "0.6.1"
 
 [[test]]
 name = "config_log"

libsqlite3-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libsqlite3-sys"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["John Gallagher <jgallagher@bignerdranch.com>"]
 repository = "https://github.com/jgallagher/rusqlite"
 description = "Native bindings to the libsqlite3 library"

libsqlite3-sys/build.rs

@@ -4,27 +4,24 @@ extern crate pkg_config;
 #[cfg(not(feature = "bundled"))]
 fn main() {
     use std::env;
-    use std::fs;
 
     // Allow users to specify where to find SQLite.
-    let lib_dir = match env::var("SQLITE3_LIB_DIR") {
-        Ok(dir) => dir,
+    match env::var("SQLITE3_LIB_DIR") {
+        Ok(dir) => {
+            println!("cargo:rustc-link-lib=sqlite3");
+            println!("cargo:rustc-link-search={}", dir);
+        }
         Err(_) => {
             // See if pkg-config can do everything for us.
-            if pkg_config::find_library("sqlite3").is_ok() {
-                return
-            }
-
-            // Try to fall back to /usr/lib if pkg-config failed.
-            match fs::metadata("/usr/lib") {
-                Ok(ref attr) if attr.is_dir() => "/usr/lib".to_owned(),
-                _ => panic!("Could not find sqlite3. Try setting SQLITE3_LIB_DIR."),
-            }
-        },
-    };
-
+            if !pkg_config::find_library("sqlite3").is_ok() {
+                // No env var set and pkg-config couldn't help; just output the link-lib
+                // request and hope that the library exists on the system paths. We used to
+                // output /usr/lib explicitly, but that can introduce other linking problems; see
+                // https://github.com/jgallagher/rusqlite/issues/207.
                 println!("cargo:rustc-link-lib=sqlite3");
-    println!("cargo:rustc-link-search={}", lib_dir);
+            }
+        }
+    };
 }
 
 #[cfg(feature = "bundled")]