Don't ask to link to /usr/lib directly if pkg-config fails to find SQLite.

This commit is contained in:
John Gallagher 2017-01-23 20:17:14 -05:00
parent 2b78e956dc
commit f130f62b1a

View File

@ -4,27 +4,24 @@ extern crate pkg_config;
#[cfg(not(feature = "bundled"))] #[cfg(not(feature = "bundled"))]
fn main() { fn main() {
use std::env; use std::env;
use std::fs;
// Allow users to specify where to find SQLite. // Allow users to specify where to find SQLite.
let lib_dir = match env::var("SQLITE3_LIB_DIR") { match env::var("SQLITE3_LIB_DIR") {
Ok(dir) => dir, Ok(dir) => {
println!("cargo:rustc-link-lib=sqlite3");
println!("cargo:rustc-link-search={}", dir);
}
Err(_) => { Err(_) => {
// See if pkg-config can do everything for us. // See if pkg-config can do everything for us.
if pkg_config::find_library("sqlite3").is_ok() { if !pkg_config::find_library("sqlite3").is_ok() {
return // 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
// Try to fall back to /usr/lib if pkg-config failed. // https://github.com/jgallagher/rusqlite/issues/207.
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."),
}
},
};
println!("cargo:rustc-link-lib=sqlite3"); println!("cargo:rustc-link-lib=sqlite3");
println!("cargo:rustc-link-search={}", lib_dir); }
}
};
} }
#[cfg(feature = "bundled")] #[cfg(feature = "bundled")]