Merge pull request #31 from mykmelez/revert-android-workaround

Revert "Fix Android cross-compile build: `cargo build --target armv7-linux-androideabi`"
without.crypto
Nan Jiang 6 years ago committed by GitHub
commit c84f0604a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 17
      lmdb-sys/build.rs

@ -11,16 +11,11 @@ fn main() {
lmdb.push("liblmdb"); lmdb.push("liblmdb");
if !pkg_config::find_library("liblmdb").is_ok() { if !pkg_config::find_library("liblmdb").is_ok() {
let target = env::var("TARGET").expect("No TARGET found"); cc::Build::new()
let mut build = cc::Build::new(); .file(lmdb.join("mdb.c"))
if target.contains("android") { .file(lmdb.join("midl.c"))
build.define("ANDROID", "1"); // https://github.com/LMDB/lmdb/blob/LMDB_0.9.21/libraries/liblmdb/Makefile#L25
} .opt_level(2)
build .compile("liblmdb.a")
.file(lmdb.join("mdb.c"))
.file(lmdb.join("midl.c"))
// https://github.com/LMDB/lmdb/blob/LMDB_0.9.21/libraries/liblmdb/Makefile#L25
.opt_level(2)
.compile("liblmdb.a")
} }
} }

Loading…
Cancel
Save