diff --git a/cmake/Modules/CheckLibcxxAtomic.cmake b/cmake/Modules/CheckLibcxxAtomic.cmake
index d3b9fa466..4b40490d5 100644
--- a/cmake/Modules/CheckLibcxxAtomic.cmake
+++ b/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)
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 1bfa23fad..3e6c3599d 100644
--- a/cmake/config-ix.cmake
+++ b/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()