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 @@ -417,10 +417,10 @@ function(_add_variant_link_flags)
417
417
list (APPEND library_search_directories
418
418
${CMAKE_BINARY_DIR} /winsdk_lib_${LFLAGS_ARCH}_symlinks )
419
419
elseif ("${LFLAGS_SDK} " STREQUAL "HAIKU" )
420
- list (APPEND link_libraries "bsd" "atomic" )
420
+ list (APPEND link_libraries "bsd" )
421
421
list (APPEND result "-Wl,-Bsymbolic" )
422
422
elseif ("${LFLAGS_SDK} " STREQUAL "ANDROID" )
423
- list (APPEND link_libraries "dl" "log" "atomic" )
423
+ list (APPEND link_libraries "dl" "log" )
424
424
# We need to add the math library, which is linked implicitly by libc++
425
425
list (APPEND result "-lm" )
426
426
Original file line number Diff line number Diff line change @@ -256,19 +256,13 @@ else()
256
256
endif ()
257
257
endif ()
258
258
259
- if (SWIFT_PRIMARY_VARIANT_SDK STREQUAL ANDROID )
260
- # workaround for libatomic needing to be after object files for swiftCore.so
261
- list (APPEND swift_core_private_link_libraries atomic )
262
- elseif (SWIFT_PRIMARY_VARIANT_SDK STREQUAL CYGWIN )
259
+ if (SWIFT_PRIMARY_VARIANT_SDK STREQUAL CYGWIN )
263
260
# TODO(compnerd) cache this variable to permit re-configuration
264
261
execute_process (COMMAND "cygpath" "-u" "$ENV{SYSTEMROOT} " OUTPUT_VARIABLE ENV_SYSTEMROOT )
265
262
list (APPEND swift_core_private_link_libraries "${ENV_SYSTEMROOT} /system32/psapi.dll" )
266
263
elseif (SWIFT_PRIMARY_VARIANT_SDK STREQUAL FREEBSD )
267
264
find_library (EXECINFO_LIBRARY execinfo )
268
265
list (APPEND swift_core_private_link_libraries ${EXECINFO_LIBRARY} )
269
- # workaround for libatomic needing to be after object files for swiftCore.so
270
- list (APPEND swift_core_private_link_libraries
271
- ${SWIFTLIB_DIR} /clang/lib/freebsd/libclang_rt.builtins-${SWIFT_PRIMARY_VARIANT_ARCH}.a )
272
266
elseif (SWIFT_PRIMARY_VARIANT_SDK STREQUAL LINUX )
273
267
if (SWIFT_BUILD_STATIC_STDLIB )
274
268
list (APPEND swift_core_private_link_libraries swiftImageInspectionShared )
You can’t perform that action at this time.
0 commit comments