[libcxx-commits] [libcxx] 1a7e688 - Revert "[libcxx] Force-cache LIBCXX_CXX_ABI_LIBRARY_PATH"

[Hans Wennborg via libcxx-commits]

Author: Sergej Jaskiewicz
Date: 2020-02-03T11:03:58+01:00
New Revision: 1a7e688b0b5a986fbbbce62ff1506a5991b0fce0

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

LOG: Revert "[libcxx] Force-cache LIBCXX_CXX_ABI_LIBRARY_PATH"

This reverts commit 41f4dfd63ea0fe995ddfba1838aa5ed972cc1377.

It broke standalone libc++ builds, which now try to use libc++abi from the wrong directory, instead of system instance.

(cherry picked from commit 3573526c0286c9461f0459be1a4592b2214594e7)

Added: 
    

Modified: 
    libcxx/test/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libcxx/test/CMakeLists.txt b/libcxx/test/CMakeLists.txt
index 6dd8fb658f61..81474511b58c 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." FORCE)
+      "The path to libc++abi library.")
 endif()
 
 set(LIBCXX_TARGET_INFO "libcxx.test.target_info.LocalTI" CACHE STRING