This is an archive of the discontinued LLVM Phabricator instance.

Differential D56061

[clang-tools-extra] [clangd] Fix detecting atomics in stand-alone builds
ClosedPublic

Authored by mgorny on Dec 23 2018, 12:04 PM.

Details

Reviewers
bkramer
sdardis
sammccall
ilya-biryukov
Commits
rGc1d5999dd1e8: [clangd] Fix detecting atomics in stand-alone builds
rL350329: [clangd] Fix detecting atomics in stand-alone builds
rCTE350329: [clangd] Fix detecting atomics in stand-alone builds
Summary

Include CheckAtomic CMake module from LLVM in order to detect support
for atomics when building stand-alone. Otherwise,
the HAVE_CXX_ATOMICS64_WITHOUT_LIB variable is undefined and clangd
wrongly attempts to link -latomic on systems not using the library.

Original bug report: https://bugs.gentoo.org/667016

Diff Detail

Event Timeline

mgorny created this revision.Dec 23 2018, 12:04 PM
Herald added subscribers: kadircet, jfb, arphaman and 3 others. · View Herald TranscriptDec 23 2018, 12:04 PM
ilya-biryukov accepted this revision.Jan 3 2019, 5:51 AM

LGTM. Thanks for the fix.

This revision is now accepted and ready to land.Jan 3 2019, 5:51 AM
Closed by commit rCTE350329: [clangd] Fix detecting atomics in stand-alone builds (authored by mgorny). · Explain WhyJan 3 2019, 8:47 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clangd/
5 lines

Diff 180087

clangd/CMakeLists.txt

set(LLVM_LINK_COMPONENTS set(LLVM_LINK_COMPONENTS
Support Support
) )
if(CLANG_BUILT_STANDALONE)
# needed to get HAVE_CXX_ATOMICS64_WITHOUT_LIB defined
include(CheckAtomic)
endif()
set(CLANGD_ATOMIC_LIB "") set(CLANGD_ATOMIC_LIB "")
if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB) if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
list(APPEND CLANGD_ATOMIC_LIB "atomic") list(APPEND CLANGD_ATOMIC_LIB "atomic")
endif() endif()
add_clang_library(clangDaemon add_clang_library(clangDaemon
AST.cpp AST.cpp
Cancellation.cpp Cancellation.cpp
▲ Show 20 Lines • Show All 94 Lines • Show Last 20 Lines