From 867a4e7b8b7593c4e03b824a994e33a51b075af3 Mon Sep 17 00:00:00 2001 From: Vasileios Kalintiris Date: Tue, 16 Feb 2016 14:15:27 +0000 Subject: [PATCH] Issue a warning instead of fatal errors when checks for libatomic fail. This should fix PR26631, PR26622 and has the nice property that the addition of the CheckLibcxxAtomic.cmake module acts as an NFC on the platforms of the reporters (at least for the time being). As these bug reports explain, CMake fails the atomic check because the include headers might not exist in the host environment. We could potentially point to the headers provided by libcxx itself. llvm-svn: 260961 --- libcxx/cmake/Modules/CheckLibcxxAtomic.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcxx/cmake/Modules/CheckLibcxxAtomic.cmake b/libcxx/cmake/Modules/CheckLibcxxAtomic.cmake index 95ed72e53812..9f2632736386 100644 --- a/libcxx/cmake/Modules/CheckLibcxxAtomic.cmake +++ b/libcxx/cmake/Modules/CheckLibcxxAtomic.cmake @@ -33,9 +33,9 @@ if(NOT LIBCXX_HAVE_CXX_ATOMICS_WITHOUT_LIB) list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic") check_cxx_atomics(LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB) if (NOT LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB) - message(FATAL_ERROR "Host compiler must support std::atomic!") + message(WARNING "Host compiler must support std::atomic!") endif() else() - message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.") + message(WARNING "Host compiler appears to require libatomic, but cannot find it.") endif() endif()