Merge branch 'tim/vendor_android_only' into 'master'

tux3 · tux3 · commit bfe9304eeb6f · 2022-11-28T10:37:06.000Z
hack: Temporarily disable vendoring on iOS, until downstream fixes

See merge request TankerHQ/sdk-rust!155
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")
         }

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,9 @@ fn main() -> Result<(), Box<dyn Error>> {`
`59`	`59`	`if target_family != "windows" {`
`60`	`60`	`println!("cargo:rustc-link-search={}", bindings_folder);`
`61`	`61`	`println!("cargo:rustc-link-lib=static=ctanker");`
	`62`	`+ // FIXME: Re-enable vendoring on iOS after downstream fixes`
`62`	`63`	`if !cfg!(feature = "without_vendored_libcxx")`
`63`		`- && (target_triplet.contains("-linux-android") \|\| target_triplet.contains("-apple-ios"))`
	`64`	`+ && (target_triplet.contains("-linux-android")/* \|\| target_triplet.contains("-apple-ios") */)`
`64`	`65`	`{`
`65`	`66`	`println!("cargo:rustc-link-lib=static=cxx_vendored")`
`66`	`67`	`}`