[libcxx-commits] [libcxx] f8c8bda - [libc++] Remove temporary workaround for existing CMake caches

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2022-05-26T09:36:15-04:00
New Revision: f8c8bda965dd0f622de1ad3863b728661af6eb72

URL: https://github.com/llvm/llvm-project/commit/f8c8bda965dd0f622de1ad3863b728661af6eb72
DIFF: https://github.com/llvm/llvm-project/commit/f8c8bda965dd0f622de1ad3863b728661af6eb72.diff

LOG: [libc++] Remove temporary workaround for existing CMake caches

If you are broken by this change, you should remove your CMake cache and
re-run the CMake generation step.

Added: 
    

Modified: 
    libcxx/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index a182a76dda782..c36b8e61b30d1 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -221,12 +221,6 @@ endif()
 
 set(LIBCXX_SUPPORTED_ABI_LIBRARIES none libcxxabi system-libcxxabi libcxxrt libstdc++ libsupc++ vcruntime)
 set(LIBCXX_CXX_ABI "${LIBCXX_DEFAULT_ABI_LIBRARY}" CACHE STRING "Specify C++ ABI library to use. Supported values are ${LIBCXX_SUPPORTED_ABI_LIBRARIES}.")
-
-# Temporary to still accept existing CMake caches that contain "default" as the value
-if (LIBCXX_CXX_ABI STREQUAL "default")
-  set(LIBCXX_CXX_ABI "${LIBCXX_DEFAULT_ABI_LIBRARY}" CACHE STRING "" FORCE)
-endif()
-
 if (NOT "${LIBCXX_CXX_ABI}" IN_LIST LIBCXX_SUPPORTED_ABI_LIBRARIES)
   message(FATAL_ERROR "Unsupported C++ ABI library: '${LIBCXX_CXX_ABI}'. Supported values are ${LIBCXX_SUPPORTED_ABI_LIBRARIES}.")
 endif()