Skip to content

Commit

Permalink
Switch back to matching target_os rather than target_vendor
Browse files Browse the repository at this point in the history
`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 <#4282>)
(cherry picked from commit a986f81)
  • Loading branch information
tgross35 committed Feb 22, 2025
1 parent a0021d2 commit 42a30ad
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion src/primitives.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 42a30ad

Please sign in to comment.