45 lines
1.9 KiB
Diff
45 lines
1.9 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index f380fe6b6b92..40ed4793dafb 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -188,7 +188,7 @@ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING
|
|
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
|
|
set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR})
|
|
set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE})
|
|
- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE STRING
|
|
+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE STRING
|
|
"Path where built libc++abi libraries should be installed.")
|
|
if(LIBCXX_LIBDIR_SUBDIR)
|
|
string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR})
|
|
@@ -202,7 +202,7 @@ else()
|
|
set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR})
|
|
set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX})
|
|
endif()
|
|
- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE STRING
|
|
+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE STRING
|
|
"Path where built libc++abi libraries should be installed.")
|
|
endif()
|
|
|
|
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
|
index 0d861cff980c..6a2a2b14fafd 100644
|
|
--- a/test/CMakeLists.txt
|
|
+++ b/test/CMakeLists.txt
|
|
@@ -17,9 +17,14 @@ else()
|
|
set(LIBCXXABI_TEST_DEPS cxxabi_static)
|
|
endif()
|
|
|
|
-list(APPEND LIBCXXABI_TEST_DEPS cxx)
|
|
-if (LIBCXXABI_USE_LLVM_UNWINDER AND TARGET unwind)
|
|
- list(APPEND LIBCXXABI_TEST_DEPS unwind)
|
|
+if(libcxx IN_LIST LLVM_ENABLE_RUNTIMES)
|
|
+ list(APPEND LIBCXXABI_TEST_DEPS cxx)
|
|
+endif()
|
|
+
|
|
+if(libunwind IN_LIST LLVM_ENABLE_RUNTIMES)
|
|
+ if (LIBCXXABI_USE_LLVM_UNWINDER AND TARGET unwind)
|
|
+ list(APPEND LIBCXXABI_TEST_DEPS unwind)
|
|
+ endif()
|
|
endif()
|
|
|
|
set(AUTO_GEN_COMMENT "## Autogenerated by libcxxabi configuration.\n# Do not edit!")
|