Skip to content

Commit f05195c

Browse files
committed
Core: add missing link against log on Android
The standard library and Concurrency depend on liblog from the NDK. Add the missing dependency to fully resolve symbols.
1 parent c1959f8 commit f05195c

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Runtimes/Core/Concurrency/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ target_link_libraries(swift_Concurrency PRIVATE
136136
swiftShims
137137
swiftConcurrencyInternalShims
138138
$<$<BOOL:${BUILD_SHARED_LIBS}>:swiftThreading>
139+
$<$<PLATFORM_ID:Android>:log>
139140
$<$<PLATFORM_ID:Windows>:Synchronization>
140141
$<$<PLATFORM_ID:Windows>:mincore>
141142
# Link to the runtime that we are just building.

Runtimes/Core/LLVMSupport/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ add_library(swiftLLVMSupport OBJECT
55
SmallPtrSet.cpp
66
SmallVector.cpp
77
StringRef.cpp)
8-
target_compile_options(swiftLLVMSupport
9-
PRIVATE
10-
$<$<BOOL:${SwiftCore_HAS_ASL}>:-DSWIFT_STDLIB_HAS_ASL>)
8+
target_compile_options(swiftLLVMSupport PRIVATE
9+
$<$<BOOL:${SwiftCore_HAS_ASL}>:-DSWIFT_STDLIB_HAS_ASL>)
10+
target_link_libraries(swiftLLVMSupport PRIVATE
11+
$<$<PLATFORM_ID:Android>:log>)
1112

1213
if(NOT BUILD_SHARED_LIBS)
1314
install(TARGETS swiftLLVMSupport

0 commit comments

Comments
 (0)