File tree Expand file tree Collapse file tree 2 files changed +3
-9
lines changed Expand file tree Collapse file tree 2 files changed +3
-9
lines changed Original file line number Diff line number Diff line change @@ -402,10 +402,10 @@ function(_add_target_variant_link_flags)
402
402
list (APPEND library_search_directories
403
403
${CMAKE_BINARY_DIR} /winsdk_lib_${LFLAGS_ARCH}_symlinks )
404
404
elseif ("${LFLAGS_SDK} " STREQUAL "HAIKU" )
405
- list (APPEND link_libraries "bsd" "atomic" )
405
+ list (APPEND link_libraries "bsd" )
406
406
list (APPEND result "-Wl,-Bsymbolic" )
407
407
elseif ("${LFLAGS_SDK} " STREQUAL "ANDROID" )
408
- list (APPEND link_libraries "dl" "log" "atomic" )
408
+ list (APPEND link_libraries "dl" "log" )
409
409
# We need to add the math library, which is linked implicitly by libc++
410
410
list (APPEND result "-lm" )
411
411
Original file line number Diff line number Diff line change @@ -259,19 +259,13 @@ else()
259
259
endif ()
260
260
endif ()
261
261
262
- if (SWIFT_PRIMARY_VARIANT_SDK STREQUAL ANDROID )
263
- # workaround for libatomic needing to be after object files for swiftCore.so
264
- list (APPEND swift_core_private_link_libraries atomic )
265
- elseif (SWIFT_PRIMARY_VARIANT_SDK STREQUAL CYGWIN )
262
+ if (SWIFT_PRIMARY_VARIANT_SDK STREQUAL CYGWIN )
266
263
# TODO(compnerd) cache this variable to permit re-configuration
267
264
execute_process (COMMAND "cygpath" "-u" "$ENV{SYSTEMROOT} " OUTPUT_VARIABLE ENV_SYSTEMROOT )
268
265
list (APPEND swift_core_private_link_libraries "${ENV_SYSTEMROOT} /system32/psapi.dll" )
269
266
elseif (SWIFT_PRIMARY_VARIANT_SDK STREQUAL FREEBSD )
270
267
find_library (EXECINFO_LIBRARY execinfo )
271
268
list (APPEND swift_core_private_link_libraries ${EXECINFO_LIBRARY} )
272
- # workaround for libatomic needing to be after object files for swiftCore.so
273
- list (APPEND swift_core_private_link_libraries
274
- ${SWIFTLIB_DIR} /clang/lib/freebsd/libclang_rt.builtins-${SWIFT_PRIMARY_VARIANT_ARCH}.a )
275
269
elseif (SWIFT_PRIMARY_VARIANT_SDK STREQUAL LINUX )
276
270
if (SWIFT_BUILD_STATIC_STDLIB )
277
271
list (APPEND swift_core_private_link_libraries )
You can’t perform that action at this time.
0 commit comments