diff options
| author | Vasileios Kalintiris <Vasileios.Kalintiris@imgtec.com> | 2016-02-16 14:15:27 +0000 |
|---|---|---|
| committer | Vasileios Kalintiris <Vasileios.Kalintiris@imgtec.com> | 2016-02-16 14:15:27 +0000 |
| commit | 867a4e7b8b7593c4e03b824a994e33a51b075af3 (patch) | |
| tree | 9089ceabbc36e130a7729f3b0e201f1c50e66316 /libcxx | |
| parent | 79944f20eacb731772bd2501a81d62d4e3416585 (diff) | |
| download | bcm5719-llvm-867a4e7b8b7593c4e03b824a994e33a51b075af3.tar.gz bcm5719-llvm-867a4e7b8b7593c4e03b824a994e33a51b075af3.zip | |
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
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/cmake/Modules/CheckLibcxxAtomic.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/cmake/Modules/CheckLibcxxAtomic.cmake b/libcxx/cmake/Modules/CheckLibcxxAtomic.cmake index 95ed72e5381..9f263273638 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() |
