From 4e86c7e476366161372eb0922e5a93bae3b380e6 Mon Sep 17 00:00:00 2001 From: Myk Melez Date: Tue, 5 Feb 2019 13:10:04 -0800 Subject: [PATCH] Revert "Fix Android cross-compile build: `cargo build --target armv7-linux-androideabi`" This reverts commit ef250445c192c5fd8630e9b29f2589b467b80e81. --- lmdb-sys/build.rs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/lmdb-sys/build.rs b/lmdb-sys/build.rs index b1bd80e..8ae769a 100644 --- a/lmdb-sys/build.rs +++ b/lmdb-sys/build.rs @@ -11,16 +11,11 @@ fn main() { lmdb.push("liblmdb"); if !pkg_config::find_library("liblmdb").is_ok() { - let target = env::var("TARGET").expect("No TARGET found"); - let mut build = cc::Build::new(); - if target.contains("android") { - build.define("ANDROID", "1"); - } - build - .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") + cc::Build::new() + .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") } }