Merge pull request #326 from adamgundry/wip/303-fix-posix_spawn_file_…

…actions_addchdir_np Correctly detect posix_spawn_file_actions_addchdir[_np]
haskell · Sep 23, 2024 · 91e7381 · 91e7381
2 parents 85dabea + f742e7f
commit 91e7381
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/cbits/posix/posix_spawn.c b/cbits/posix/posix_spawn.c
@@ -1,3 +1,7 @@
+// Necessary for POSIX_SPAWN_SETSID and posix_spawn_file_actions_addchdir_np under glibc.
+// Moreover this needs to appear before any glibc headers.
+#define _GNU_SOURCE
+
 #include "runProcess.h"
 #include "common.h"
 
@@ -25,8 +29,6 @@ do_spawn_posix (char *const args[],
 
 #else
 
-// Necessary for POSIX_SPAWN_SETSID under glibc.
-#define _GNU_SOURCE
 #include <spawn.h>
 
 extern char **environ;
@@ -135,13 +137,13 @@ do_spawn_posix (char *const args[],
     }
 
     if (workingDirectory) {
-#if defined(HAVE_posix_spawn_file_actions_addchdir)
+#if defined(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)
         r = posix_spawn_file_actions_addchdir(&fa, workingDirectory);
         if (r != 0) {
             *failed_doing = "posix_spawn_file_actions_addchdir";
             goto fail;
         }
-#elif defined(HAVE_posix_spawn_file_actions_addchdir_np)
+#elif defined(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP)
         // N.B. this function is broken on macOS.
         // See https://github.com/rust-lang/rust/pull/80537.
         r = posix_spawn_file_actions_addchdir_np(&fa, workingDirectory);