From 89cb9226c4aa1d273ad4c3ebe8dbc92bad4c3377 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Sat, 22 Feb 2025 22:24:32 +0000 Subject: [PATCH] Switch back to matching `target_os` rather than `target_vendor` `ctest` is very particular about this and the current configuration, though working most of the time, seems to cause occasional CI errors that can't easily be explained or mitigated. Switch back to matching all Apple `target_os` options until `ctest` is fixed. (backport ) (cherry picked from commit a986f81dbc23bf669fdecd81a74b6ae3999cb8c8) --- src/primitives.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/primitives.rs b/src/primitives.rs index ed71e843057b..668d3340d2ab 100644 --- a/src/primitives.rs +++ b/src/primitives.rs @@ -20,7 +20,14 @@ pub type c_double = f64; cfg_if! { if #[cfg(all( not(windows), - not(target_vendor = "apple"), + // FIXME(ctest): just use `target_vendor` = "apple"` once `ctest` supports it + not(any( + target_os = "macos", + target_os = "ios", + target_os = "tvos", + target_os = "watchos", + target_os = "visionos", + )), not(target_os = "vita"), any( target_arch = "aarch64",