Skip to content

Fix macOS posix_spawn_file_actions_addchdir availability handling #21722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arshidkv12 wants to merge 6 commits into
base: master
Choose a base branch
from
+15 −10
Open

Fix macOS posix_spawn_file_actions_addchdir availability handling #21722

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
293b38b
Fix macOS posix_spawn_file_actions_addchdir availability handling
arshidkv12 Apr 11, 2026
d8a3e82
Fix macOS posix_spawn_file_actions_addchdir availability handling
arshidkv12 Apr 11, 2026
0149360
Fix macOS posix_spawn_file_actions_addchdir availability handling
arshidkv12 Apr 13, 2026
c4bb7ab
Fix macOS posix_spawn_file_actions_addchdir availability handling
arshidkv12 Apr 13, 2026
e189414
Fix macOS posix_spawn_file_actions_addchdir availability handling
arshidkv12 Apr 13, 2026
f1e3800
Fix macOS posix_spawn_file_actions_addchdir availability handling
arshidkv12 Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions ext/standard/proc_open.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,26 @@
#define USE_POSIX_SPAWN

/* The non-_np variant is in macOS 26 (and _np deprecated) */
#ifdef HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR
#define POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR posix_spawn_file_actions_addchdir
static inline int php_spawn_addchdir(
Copy link
Copy Markdown
Member

@NattyNarwhal NattyNarwhal Apr 13, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this might be able to be simplified by checking __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__/__ENVIRONMENT_OS_VERSION_MIN_REQUIRED__ instead, since we don't need any real runtime differences, it's just a symbol name, and the old one is unlikely to go away right now even if it's deprecated. It should respect -mmacosx-version-min as well.

Copy link
Copy Markdown
Contributor Author

@arshidkv12 arshidkv12 Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you

posix_spawn_file_actions_t *factions,
const char *cwd
) {
#if defined(__APPLE__) && defined(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)
if (__builtin_available(macOS 26.0, *)) {
return posix_spawn_file_actions_addchdir(factions, cwd);
} else {
return posix_spawn_file_actions_addchdir_np(factions, cwd);
}
#elif defined(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)
return posix_spawn_file_actions_addchdir(factions, cwd);
#else
#define POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR posix_spawn_file_actions_addchdir_np
return posix_spawn_file_actions_addchdir_np(factions, cwd);
#endif
}

#define POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR(f, d) \
php_spawn_addchdir((f), (d))

#endif

/* This symbol is defined in ext/standard/config.m4.
Expand Down
Loading