Skip to content

Commit 0afc20e

Browse files
committed
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 <rust-lang#4282>) (cherry picked from commit a986f81)
1 parent b1d4d35 commit 0afc20e

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/primitives.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,14 @@ pub type c_double = f64;
2020
cfg_if! {
2121
if #[cfg(all(
2222
not(windows),
23-
not(target_vendor = "apple"),
23+
// FIXME(ctest): just use `target_vendor` = "apple"` once `ctest` supports it
24+
not(any(
25+
target_os = "macos",
26+
target_os = "ios",
27+
target_os = "tvos",
28+
target_os = "watchos",
29+
target_os = "visionos",
30+
)),
2431
not(target_os = "vita"),
2532
any(
2633
target_arch = "aarch64",

0 commit comments

Comments
 (0)