Skip to content

Commit f4e81ba

Browse files
committed
Fix upstream TSC change on CI
1 parent 93c91dd commit f4e81ba

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

swift-android-ci-except-release.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,19 @@ index 2135ce6..fbff6f6 100644
1111
#else
1212
public import SWBLibc
1313
#endif
14+
diff --git a/swift-tools-support-core/Sources/TSCBasic/Process/Process.swift b/swift-tools-support-core/Sources/TSCBasic/Process/Process.swift
15+
index 346bd4e..928bf80 100644
16+
--- a/swift-tools-support-core/Sources/TSCBasic/Process/Process.swift
17+
+++ b/swift-tools-support-core/Sources/TSCBasic/Process/Process.swift
18+
@@ -1316,7 +1316,7 @@ extension Process: Hashable {
19+
// MARK: - Private helpers
20+
21+
#if !os(Windows)
22+
-#if canImport(Darwin) || os(FreeBSD) || os(OpenBSD)
23+
+#if canImport(Darwin) || canImport(Android) || os(OpenBSD) || os(FreeBSD)
24+
public typealias swiftpm_posix_spawn_file_actions_t = posix_spawn_file_actions_t?
25+
#else
26+
public typealias swiftpm_posix_spawn_file_actions_t = posix_spawn_file_actions_t
1427
diff --git a/swiftpm/Sources/swift-build-prebuilts/BuildPrebuilts.swift b/swiftpm/Sources/swift-build-prebuilts/BuildPrebuilts.swift
1528
index ffa6b7f3f..abe453232 100644
1629
--- a/swiftpm/Sources/swift-build-prebuilts/BuildPrebuilts.swift

0 commit comments

Comments
 (0)