Merge branch 'tim/vendor_android_only' into 'master'

hack: Temporarily disable vendoring on iOS, until downstream fixes See merge request TankerHQ/sdk-rust!155
TankerHQ · Nov 28, 2022 · bfe9304 · bfe9304
2 parents f5594cb + c1e8780
commit bfe9304
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/build.rs b/build.rs
@@ -59,8 +59,9 @@ fn main() -> Result<(), Box<dyn Error>> {
     if target_family != "windows" {
         println!("cargo:rustc-link-search={}", bindings_folder);
         println!("cargo:rustc-link-lib=static=ctanker");
+        // FIXME: Re-enable vendoring on iOS after downstream fixes
         if !cfg!(feature = "without_vendored_libcxx")
-            && (target_triplet.contains("-linux-android") || target_triplet.contains("-apple-ios"))
+            && (target_triplet.contains("-linux-android")/* || target_triplet.contains("-apple-ios") */)
         {
             println!("cargo:rustc-link-lib=static=cxx_vendored")
         }