Skip to content

Commit 36f6ebd

Browse files
committed
Supplemental: adjust Android linkage
This fixes up the Android builds to properly link against the right modules. With this we properly propagate the necessary flags to build the runtimes without colliding with existing builds.
1 parent e3e56c4 commit 36f6ebd

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

Runtimes/Supplemental/Differentiation/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ set_target_properties(swift_Differentiation PROPERTIES
107107

108108
target_link_libraries(swift_Differentiation PRIVATE
109109
swiftCore
110+
$<$<PLATFORM_ID:Android>:swiftAndroid>
110111
$<$<PLATFORM_ID:Windows>:swiftCRT>)
111112

112113

Runtimes/Supplemental/Distributed/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ target_link_libraries(swiftDistributed PRIVATE
134134
swiftCore
135135
swift_Concurrency
136136
swift_Builtin_float
137+
$<$<PLATFORM_ID:Android>:swiftAndroid>
137138
$<$<PLATFORM_ID:Windows>:swiftWinSDK>)
138139
# swiftDarwin/Libc/Platform
139140

Runtimes/Supplemental/Synchronization/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ set_target_properties(swiftSynchronization PROPERTIES
128128

129129
target_link_libraries(swiftSynchronization PRIVATE
130130
swiftCore
131-
$<$<PLATFORM_ID:Android>:SwiftAndroid>
131+
$<$<PLATFORM_ID:Android>:swiftAndroid>
132132
$<$<PLATFORM_ID:Darwin>:swiftDarwin>
133133
$<$<PLATFORM_ID:Windows>:ClangModules>)
134134

0 commit comments

Comments
 (0)