[libcxx-commits] [libcxx] 4431e8c - [libc++] Override the value of LIBCXX_CXX_ABI in the cache

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2022-05-19T11:21:09-04:00
New Revision: 4431e8c84e6290b6b6f28d471f7584f0d9ccbb7b

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

LOG: [libc++] Override the value of LIBCXX_CXX_ABI in the cache

This will allow us to remove this entirely once the commit has propagated
through all CI and hence changed the value in the cache.

Added: 
    

Modified: 
    libcxx/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index e06f3ec559ec..7dd32b13e3be 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -224,7 +224,7 @@ set(LIBCXX_CXX_ABI "${LIBCXX_DEFAULT_ABI_LIBRARY}" CACHE STRING "Specify C++ ABI
 
 # 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}")
+  set(LIBCXX_CXX_ABI "${LIBCXX_DEFAULT_ABI_LIBRARY}" CACHE STRING "" FORCE)
 endif()
 
 if (NOT "${LIBCXX_CXX_ABI}" IN_LIST LIBCXX_SUPPORTED_ABI_LIBRARIES)