if libatomic is found only link it if libgcc is the rtlib Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libcxx/CMakeLists.txt =================================================================== --- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/libcxx/CMakeLists.txt +++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libcxx/CMakeLists.txt @@ -774,12 +774,14 @@ function(cxx_link_system_libraries targe endif() elseif (LIBCXX_HAS_GCC_LIB) target_link_libraries(${target} PRIVATE gcc) + if (LIBCXX_HAS_ATOMIC_LIB) + target_link_libraries(${target} PRIVATE atomic) + endif() elseif (LIBCXX_HAS_GCC_S_LIB) target_link_libraries(${target} PRIVATE gcc_s) - endif() - - if (LIBCXX_HAS_ATOMIC_LIB) - target_link_libraries(${target} PRIVATE atomic) + if (LIBCXX_HAS_ATOMIC_LIB) + target_link_libraries(${target} PRIVATE atomic) + endif() endif() if (MINGW)