[libcxx-commits] [libcxx] 41f4dfd - [libcxx] Force-cache LIBCXX_CXX_ABI_LIBRARY_PATH

[Sergej Jaskiewicz via libcxx-commits]

Author: Sergej Jaskiewicz
Date: 2020-01-10T12:56:43+03:00
New Revision: 41f4dfd63ea0fe995ddfba1838aa5ed972cc1377

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

LOG: [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

Added: 
    

Modified: 
    libcxx/test/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libcxx/test/CMakeLists.txt b/libcxx/test/CMakeLists.txt
index 81474511b58c..6dd8fb658f61 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