Author: ericwf
Date: Thu Feb 11 09:05:56 2016
New Revision: 260524
URL: http://llvm.org/viewvc/llvm-project?rev=260524&view=rev
Log:
Fix r260515 - Correct typos in CMake changes
Modified:
libcxx/trunk/cmake/Modules/CheckLibcxxAtomic.cmake
libcxx/trunk/cmake/config-ix.cmake
Modified: libcxx/trunk/cmake/Modules/CheckLibcxxAtomic.cmake
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/cmake/Modules/CheckLibcxxAtomic.cmake?rev=260524&r1=260523&r2=260524&view=diff
==============================================================================
--- libcxx/trunk/cmake/Modules/CheckLibcxxAtomic.cmake (original)
+++ libcxx/trunk/cmake/Modules/CheckLibcxxAtomic.cmake Thu Feb 11 09:05:56 2016
@@ -25,11 +25,11 @@ int main() {
set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
endfunction(check_cxx_atomics)
-check_cxx_atomics(LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB)
+check_cxx_atomics(LIBCXX_HAVE_CXX_ATOMICS_WITHOUT_LIB)
# If not, check if the library exists, and atomics work with it.
-if(NOT LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB)
- check_library_exists(atomic __atomic_fetch_add_8 "" HAVE_LIBATOMIC)
- if(HAVE_LIBATOMIC)
+if(NOT LIBCXX_HAVE_CXX_ATOMICS_WITHOUT_LIB)
+ check_library_exists(atomic __atomic_fetch_add_8 "" LIBCXX_HAS_ATOMIC_LIB)
+ if(LIBCXX_HAS_ATOMIC_LIB)
list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
check_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB)
if (NOT HAVE_CXX_ATOMICS_WITH_LIB)
Modified: libcxx/trunk/cmake/config-ix.cmake
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/cmake/config-ix.cmake?rev=260524&r1=260523&r2=260524&view=diff
==============================================================================
--- libcxx/trunk/cmake/config-ix.cmake (original)
+++ libcxx/trunk/cmake/config-ix.cmake Thu Feb 11 09:05:56 2016
@@ -18,7 +18,3 @@ check_library_exists(c fopen "" LIBCXX_H
check_library_exists(m ccos "" LIBCXX_HAS_M_LIB)
check_library_exists(rt clock_gettime "" LIBCXX_HAS_RT_LIB)
check_library_exists(gcc_s __gcc_personality_v0 "" LIBCXX_HAS_GCC_S_LIB)
-
-if (NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
- set(LIBCXX_HAS_ATOMIC_LIB True)
-endif()
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
