diff options
| author | Sergej Jaskiewicz <jaskiewiczs@icloud.com> | 2020-01-10 12:54:49 +0300 |
|---|---|---|
| committer | Sergej Jaskiewicz <jaskiewiczs@icloud.com> | 2020-01-10 12:56:43 +0300 |
| commit | 41f4dfd63ea0fe995ddfba1838aa5ed972cc1377 (patch) | |
| tree | f022cbebd605aefd0e92e53e0aed6920578e2af6 | |
| parent | 356685a1d8972180f472c1333e8e89dbcc704c1d (diff) | |
| download | bcm5719-llvm-41f4dfd63ea0fe995ddfba1838aa5ed972cc1377.tar.gz bcm5719-llvm-41f4dfd63ea0fe995ddfba1838aa5ed972cc1377.zip | |
[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
| -rw-r--r-- | libcxx/test/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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 |
