From b91e1f3aeb4e96480a24c297824242a692f52bb9 Mon Sep 17 00:00:00 2001 From: Tpt Date: Tue, 23 May 2023 12:33:54 +0200 Subject: [PATCH] Fixes cross compilation of RocksDB with zig targeting macOS --- oxrocksdb-sys/build.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oxrocksdb-sys/build.rs b/oxrocksdb-sys/build.rs index 29f3fdda..ff8a633b 100644 --- a/oxrocksdb-sys/build.rs +++ b/oxrocksdb-sys/build.rs @@ -1,7 +1,7 @@ // Code from https://github.com/rust-rocksdb/rust-rocksdb/blob/eb2d302682418b361a80ad8f4dcf335ade60dcf5/librocksdb-sys/build.rs // License: https://github.com/rust-rocksdb/rust-rocksdb/blob/master/LICENSE -use std::env::{set_var, var}; +use std::env::{remove_var, set_var, var}; use std::path::PathBuf; fn link(name: &str, bundled: bool) { @@ -98,11 +98,13 @@ fn build_rocksdb() { config.define("NPERF_CONTEXT", None); config.define("ROCKSDB_PLATFORM_POSIX", None); config.define("ROCKSDB_LIB_IO_POSIX", None); + remove_var("SDKROOT"); // We override SDKROOT for cross-compilation set_var("IPHONEOS_DEPLOYMENT_TARGET", "11.0"); } else if target.contains("darwin") { config.define("OS_MACOSX", None); config.define("ROCKSDB_PLATFORM_POSIX", None); config.define("ROCKSDB_LIB_IO_POSIX", None); + remove_var("SDKROOT"); // We override SDKROOT for cross-compilation } else if target.contains("android") { config.define("OS_ANDROID", None); config.define("ROCKSDB_PLATFORM_POSIX", None); @@ -177,6 +179,7 @@ fn build_rocksdb() { } config.file(&format!("rocksdb/{file}")); } + config.compile("rocksdb"); }