Skip to content

Commit 431138b

Browse files
authored
Merge pull request #80408 from al45tair/fix-new-build-concurrency
[Concurrency] Fix new build script.
2 parents 26259f6 + 29da717 commit 431138b

File tree

5 files changed

+20
-4
lines changed

5 files changed

+20
-4
lines changed

Runtimes/Core/Concurrency/CMakeLists.txt

+10
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ add_library(swift_Concurrency
1111
ConcurrencyHooks.cpp
1212
EmbeddedSupport.cpp
1313
Error.cpp
14+
ExecutorBridge.cpp
1415
ExecutorChecks.cpp
1516
GlobalExecutor.cpp
1617
Setup.cpp
@@ -47,6 +48,7 @@ add_library(swift_Concurrency
4748
CheckedContinuation.swift
4849
Clock.swift
4950
ContinuousClock.swift
51+
CooperativeExecutor.swift
5052
Deque/_DequeBuffer.swift
5153
Deque/_DequeBufferHeader.swift
5254
Deque/_DequeSlot.swift
@@ -67,19 +69,27 @@ add_library(swift_Concurrency
6769
Deque/Deque+UnsafeHandle.swift
6870
Deque/UnsafeMutableBufferPointer+Utilities.swift
6971
DiscardingTaskGroup.swift
72+
DummyExecutor.swift
7073
Errors.swift
7174
Executor.swift
7275
ExecutorAssertions.swift
76+
ExecutorBridge.swift
7377
GlobalActor.swift
7478
GlobalConcurrentExecutor.swift
7579
MainActor.swift
7680
PartialAsyncTask.swift
81+
PlatformExecutorDarwin.swift
82+
PlatformExecutorLinux.swift
83+
PlatformExecutorWindows.swift
84+
PriorityQueue.swift
7785
SourceCompatibilityShims.swift
7886
SuspendingClock.swift
7987
Task.swift
88+
Task+PriorityEscalation.swift
8089
Task+TaskExecutor.swift
8190
TaskCancellation.swift
8291
TaskGroup.swift
92+
TaskGroup+Embedded.swift
8393
TaskLocal.swift
8494
TaskSleep.swift
8595
TaskSleepDuration.swift

Runtimes/Core/Concurrency/dispatch.cmake

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
find_package(dispatch QUIET REQUIRED)
33

44
target_sources(swift_Concurrency PRIVATE
5-
DispatchGlobalExecutor.cpp)
5+
DispatchGlobalExecutor.cpp
6+
DispatchExecutor.swift
7+
CFExecutor.swift
8+
ExecutorImpl.swift)
69
target_compile_definitions(swift_Concurrency PRIVATE
710
$<$<COMPILE_LANGUAGE:C,CXX>:-DSWIFT_CONCURRENCY_USES_DISPATCH=1>)
811
target_compile_options(swift_Concurrency PRIVATE
+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
target_sources(swift_Concurrency PRIVATE
2-
NonDispatchGlobalExecutor.cpp)
2+
ExecutorImpl.swift
3+
PlatformExecutorNone.swift)

Runtimes/Core/Concurrency/none.cmake

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
target_sources(swift_Concurrency PRIVATE
2-
NonDispatchGlobalExecutor.cpp)
2+
ExecutorImpl.swift
3+
PlatformExecutorNone.swift)
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
target_sources(swift_Concurrency PRIVATE
2-
CooperativeGlobalExecutor.cpp)
2+
ExecutorImpl.swift
3+
PlatformExecutorCooperative.swift)

0 commit comments

Comments
 (0)