From 74aa5bb20b3d8e1ed2b590053fdd665e9dde8462 Mon Sep 17 00:00:00 2001 From: Michal Gorny Date: Thu, 3 Jan 2019 16:43:27 +0000 Subject: [PATCH] [clangd] Fix detecting atomics in stand-alone builds 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 Differential Revision: https://reviews.llvm.org/D56061 git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@350329 91177308-0d34-0410-b5e6-96231b3b80d8 --- clangd/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/clangd/CMakeLists.txt b/clangd/CMakeLists.txt index 39467bd5..251ee7fc 100644 --- a/tools/extra/clangd/CMakeLists.txt +++ b/tools/extra/clangd/CMakeLists.txt @@ -2,6 +2,11 @@ set(LLVM_LINK_COMPONENTS Support ) +if(CLANG_BUILT_STANDALONE) + # needed to get HAVE_CXX_ATOMICS64_WITHOUT_LIB defined + include(CheckAtomic) +endif() + set(CLANGD_ATOMIC_LIB "") if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB) list(APPEND CLANGD_ATOMIC_LIB "atomic") -- 2.20.1