Skip to content

Commit a75c546

Browse files
authored
Merge pull request #493 from dmbryson/swift-5.1-branch
Revert macOS posix_spawn_fileaction_chdir_np() adoption
2 parents 17221fe + b90d345 commit a75c546

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

lib/Basic/Subprocess.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ int pthread_fchdir_np(int fd)
7373

7474
#ifndef HAVE_POSIX_SPAWN_CHDIR
7575
#if defined(__sun) || \
76-
(defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || \
7776
__GLIBC_PREREQ(2, 29)
7877
#define HAVE_POSIX_SPAWN_CHDIR 1
7978
#else
@@ -87,12 +86,6 @@ static int posix_spawn_file_actions_addchdir(posix_spawn_file_actions_t * __rest
8786
#if HAVE_POSIX_SPAWN_CHDIR
8887
return ::posix_spawn_file_actions_addchdir_np(file_actions, path);
8988
#else
90-
#if defined(__APPLE__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
91-
if (__builtin_available(macOS 10.15, *)) {
92-
return ::posix_spawn_file_actions_addchdir_np(file_actions, path);
93-
}
94-
#endif
95-
9689
// Any other POSIX platform returns ENOSYS (Function not implemented),
9790
// to simplify the fallback logic around the call site.
9891
return ENOSYS;

0 commit comments

Comments
 (0)