Skip to content

Commit 51c73fa

Browse files
committed
ci: Add an x86_64-apple job
I'm not sure why this was missing: possibly because it was only previously only possible to test with macos-13. GHA now has macos-15-intel which makes this easier, so add the job back. (backport <rust-lang#4777>) (cherry picked from commit eb88448)
1 parent 1fe5297 commit 51c73fa

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

.github/workflows/ci.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,8 @@ jobs:
204204
- target: wasm32-unknown-emscripten
205205
- target: wasm32-wasip1
206206
- target: wasm32-wasip2
207+
- target: x86_64-apple-darwin
208+
os: macos-15-intel
207209
- target: x86_64-linux-android
208210
# FIXME: Exec format error (os error 8)
209211
# - target: x86_64-unknown-linux-gnux32

libc-test/build.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ fn test_apple(target: &str) {
317317
(x86_64, "crt_externs.h"),
318318
);
319319

320-
cfg.skip_struct(|s| {
320+
cfg.skip_struct(move |s| {
321321
match s.ident() {
322322
// FIXME(union): actually a union
323323
"sigval" => true,
@@ -326,6 +326,9 @@ fn test_apple(target: &str) {
326326
// it is a moving target, changing through versions
327327
// also contains bitfields members
328328
"tcp_connection_info" => true,
329+
330+
// FIXME(macos): The size is changed in recent macOSes.
331+
"malloc_introspection_t" if x86_64 => true,
329332
_ => false,
330333
}
331334
});
@@ -351,6 +354,8 @@ fn test_apple(target: &str) {
351354
match func.ident() {
352355
// FIXME: https://github.com/rust-lang/libc/issues/1272
353356
"execv" | "execve" | "execvp" => true,
357+
// close calls the close_nocancel system call on x86
358+
"close" if x86_64 => true,
354359
// FIXME(1.0): std removed libresolv support: https://github.com/rust-lang/rust/pull/102766
355360
"res_init" => true,
356361
_ => false,

0 commit comments

Comments
 (0)