Skip to content

Commit cd69769

Browse files
committed
Remove Marc's llbuild patch from CI that was upstreamed to devel branch
1 parent 3e3497b commit cd69769

File tree

1 file changed

+0
-32
lines changed

1 file changed

+0
-32
lines changed

swift-android-devel.patch

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,3 @@
1-
From: Marc Prud'hommeaux <[email protected]>
2-
Date: Wed, 7 May 2025 10:24:19 -0400
3-
4-
diff --git a/llbuild/lib/Basic/Subprocess.cpp b/llbuild/lib/Basic/Subprocess.cpp
5-
index bf2fd4d1..8d4ee3de 100644
6-
--- a/llbuild/lib/Basic/Subprocess.cpp
7-
+++ b/llbuild/lib/Basic/Subprocess.cpp
8-
@@ -79,9 +79,12 @@ int pthread_fchdir_np(int fd)
9-
// Implementation mostly copied from _CFPosixSpawnFileActionsChdir in swift-corelibs-foundation
10-
static int posix_spawn_file_actions_addchdir_polyfill(posix_spawn_file_actions_t * __restrict file_actions,
11-
const char * __restrict path) {
12-
-#if defined(__GLIBC__) && !__GLIBC_PREREQ(2, 29)
13-
+#if (defined(__GLIBC__) && !__GLIBC_PREREQ(2, 29)) || (defined(__OpenBSD__)) || (defined(__ANDROID__) && __ANDROID_API__ < 34)
14-
// Glibc versions prior to 2.29 don't support posix_spawn_file_actions_addchdir_np, impacting:
15-
// - Amazon Linux 2 (EoL mid-2025)
16-
+ // Currently missing as of:
17-
+ // - OpenBSD 7.5 (April 2024)
18-
+ // - Android <= 14
19-
return ENOSYS;
20-
#elif defined(__APPLE__) && defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
21-
// Conditionally available on macOS if building with a deployment target older than 10.15
22-
@@ -89,10 +92,6 @@ static int posix_spawn_file_actions_addchdir_polyfill(posix_spawn_file_actions_t
23-
return posix_spawn_file_actions_addchdir_np(file_actions, path);
24-
}
25-
return ENOSYS;
26-
-#elif defined(__OpenBSD__)
27-
- // Currently missing as of:
28-
- // - OpenBSD 7.5 (April 2024)
29-
- return ENOSYS;
30-
#elif defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) || (defined(__ANDROID__) && __ANDROID_API__ >= 34) || defined(__musl__)
31-
// Pre-standard posix_spawn_file_actions_addchdir_np version available in:
32-
// - Solaris 11.3 (October 2015)
331
diff --git a/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c b/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c
342
index 5769a3317e..916a7accbb 100644
353
--- a/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c

0 commit comments

Comments
 (0)