Skip to content

Commit f19e5b4

Browse files
committed
Runtimes: wire up the overlay to the Synchornization library
This allows us to pass along the overlay VFS mappings to workaround the PCM compilation not receiving the builtin mapping from the compiler.
1 parent 1a116f3 commit f19e5b4

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

Runtimes/Supplemental/Synchronization/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ set(${PROJECT_NAME}_VENDOR_MODULE_DIR "${CMAKE_SOURCE_DIR}/../cmake/modules/vend
4040
CACHE FILEPATH "Location for private build system extension")
4141

4242
find_package(SwiftCore REQUIRED)
43+
find_package(SwiftOverlay)
4344

4445
include(GNUInstallDirs)
4546

@@ -111,7 +112,8 @@ add_library(swiftSynchronization
111112

112113
# Determine Mutex definition
113114
if(${PROJECT_NAME}_SINGLE_THREADED_MODE)
114-
target_sources(swiftSynchronization PRIVATE Mutex/MutexUnavailable.swift)
115+
target_sources(swiftSynchronization PRIVATE
116+
Mutex/MutexUnavailable.swift)
115117
else()
116118
target_sources(swiftSynchronization PRIVATE
117119
Mutex/Mutex.swift
@@ -126,6 +128,7 @@ set_target_properties(swiftSynchronization PROPERTIES
126128

127129
target_link_libraries(swiftSynchronization PRIVATE
128130
swiftCore
131+
$<$<PLATFORM_ID:Android>:SwiftAndroid>
129132
$<$<PLATFORM_ID:Darwin>:swiftDarwin>)
130133

131134
install(TARGETS swiftSynchronization

utils/build.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2424,6 +2424,7 @@ function Build-ExperimentalRuntime {
24242424
CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
24252425

24262426
SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";
2427+
SwiftOverlay_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalOverlay)\cmake\SwiftOverlay";
24272428
}
24282429
}
24292430
}

0 commit comments

Comments
 (0)