From 41f4dfd63ea0fe995ddfba1838aa5ed972cc1377 Mon Sep 17 00:00:00 2001 From: Sergej Jaskiewicz Date: Fri, 10 Jan 2020 12:54:49 +0300 Subject: [PATCH] [libcxx] Force-cache LIBCXX_CXX_ABI_LIBRARY_PATH Summary: The `LIBCXX_CXX_ABI_LIBRARY_PATH` CMake variable is cached once in libcxx/cmake/Modules/HandleLibCXXABI.cmake in the `setup_abi_lib` macro, and then cached again in libcxx/test/CMakeLists.txt. There, if it is not set to a value, it is by default set to `LIBCXX_LIBRARY_DIR`. However, this new value is not actually cached, because the old (empty) value has been already cached. Use the `FORCE` CMake flag so that it is saved to the cache. This should not break anything, because the code changed here previously had no effect, when it should have. Reviewers: jroelofs, bcraig, ldionne, EricWF, mclow.lists, vvereschaka, eastig Reviewed By: vvereschaka Subscribers: mgorny, christof, dexonsmith, libcxx-commits Tags: #libc Differential Revision: https://reviews.llvm.org/D69169 --- libcxx/test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcxx/test/CMakeLists.txt b/libcxx/test/CMakeLists.txt index 81474511b58..6dd8fb658f6 100644 --- a/libcxx/test/CMakeLists.txt +++ b/libcxx/test/CMakeLists.txt @@ -46,7 +46,7 @@ pythonize_bool(LIBCXX_ENABLE_PARALLEL_ALGORITHMS) # directory. if (NOT LIBCXX_CXX_ABI_LIBRARY_PATH) set(LIBCXX_CXX_ABI_LIBRARY_PATH "${LIBCXX_LIBRARY_DIR}" CACHE PATH - "The path to libc++abi library.") + "The path to libc++abi library." FORCE) endif() set(LIBCXX_TARGET_INFO "libcxx.test.target_info.LocalTI" CACHE STRING