Procházet zdrojové kódy

Fix r260515 - Correct typos in CMake changes

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@260524 91177308-0d34-0410-b5e6-96231b3b80d8
Eric Fiselier před 9 roky
rodič
revize
df694328f1
2 změnil soubory, kde provedl 4 přidání a 8 odebrání
  1. 4 4
      cmake/Modules/CheckLibcxxAtomic.cmake
  2. 0 4
      cmake/config-ix.cmake

+ 4 - 4
cmake/Modules/CheckLibcxxAtomic.cmake

@@ -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)

+ 0 - 4
cmake/config-ix.cmake

@@ -18,7 +18,3 @@ check_library_exists(c fopen "" LIBCXX_HAS_C_LIB)
 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()