diff options
| author |   patrick <patrick@openbsd.org> | 2019-02-04 16:55:44 +0000 |
|---|---|---|
| committer | patrick <patrick@openbsd.org> | 2019-02-04 16:55:44 +0000 |
| commit | 76c648e7a477ffb2a882ad5ffe523269bd9a3f6a (patch) | |
| tree | 29d319d598650bab04e4f58e5e8769567e33091e /lib/libcxx/cmake/Modules/CheckLibcxxAtomic.cmake | |
| parent | Import libc++abi 7.0.1. (diff) | |
| download | wireguard-openbsd-76c648e7a477ffb2a882ad5ffe523269bd9a3f6a.tar.xz wireguard-openbsd-76c648e7a477ffb2a882ad5ffe523269bd9a3f6a.zip | |
Import libc++ 7.0.1.
Diffstat (limited to 'lib/libcxx/cmake/Modules/CheckLibcxxAtomic.cmake')
| -rw-r--r-- | lib/libcxx/cmake/Modules/CheckLibcxxAtomic.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/libcxx/cmake/Modules/CheckLibcxxAtomic.cmake b/lib/libcxx/cmake/Modules/CheckLibcxxAtomic.cmake index a7ae667a155..98862d42397 100644 --- a/lib/libcxx/cmake/Modules/CheckLibcxxAtomic.cmake +++ b/lib/libcxx/cmake/Modules/CheckLibcxxAtomic.cmake @@ -9,7 +9,7 @@ INCLUDE(CheckCXXSourceCompiles) function(check_cxx_atomics varname) set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) - set(CMAKE_REQUIRED_FLAGS "-nodefaultlibs -std=c++11 -nostdinc++ -isystem ${LIBCXX_SOURCE_DIR}/include") + set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -nodefaultlibs -std=c++11 -nostdinc++ -isystem ${LIBCXX_SOURCE_DIR}/include") if (${LIBCXX_GCC_TOOLCHAIN}) set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} --gcc-toolchain=${LIBCXX_GCC_TOOLCHAIN}") endif() @@ -31,7 +31,14 @@ int main() { set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS}) endfunction(check_cxx_atomics) +# Perform the check for 64bit atomics without libatomic. It may have been +# added to the required libraries during in the configuration of LLVM, which +# would cause the check for CXX atomics without libatomic to incorrectly pass. +set(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}) +list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "atomic") check_cxx_atomics(LIBCXX_HAVE_CXX_ATOMICS_WITHOUT_LIB) +set(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES}) + check_library_exists(atomic __atomic_fetch_add_8 "" LIBCXX_HAS_ATOMIC_LIB) # If not, check if the library exists, and atomics work with it. if(NOT LIBCXX_HAVE_CXX_ATOMICS_WITHOUT_LIB) |