Skip to content

Commit 32bd9f1

Browse files
committed
Cmake changes for -llog and -latomic III
1 parent 0ab8788 commit 32bd9f1

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1505,6 +1505,12 @@ function(add_swift_library name)
15051505
if("${lib}" STREQUAL "ICU_UC")
15061506
list(APPEND swiftlib_private_link_libraries_targets
15071507
"${SWIFT_${sdk}_ICU_UC}")
1508+
// temporary fix for atomic needing to be
1509+
// after object files for libswiftCore.so
1510+
if("${sdk}" STREQUAL "ANDROID")
1511+
list(APPEND swiftlib_private_link_libraries_targets
1512+
"-latomic")
1513+
endif()
15081514
elseif("${lib}" STREQUAL "ICU_I18N")
15091515
list(APPEND swiftlib_private_link_libraries_targets
15101516
"${SWIFT_${sdk}_ICU_I18N}")

0 commit comments

Comments
 (0)