21 lines
1.1 KiB
Diff
21 lines
1.1 KiB
Diff
|
diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake
|
||
|
|
index 8a6219568b3f..30ee68a47ccf 100644
|
||
|
|
--- a/cmake/base-config-ix.cmake
|
||
|
|
+++ b/cmake/base-config-ix.cmake
|
||
|
|
@@ -100,13 +100,13 @@ endif()
|
||
|
|
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
|
||
|
|
set(COMPILER_RT_OUTPUT_LIBRARY_DIR
|
||
|
|
${COMPILER_RT_OUTPUT_DIR}/lib)
|
||
|
|
- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib)
|
||
|
|
+ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}")
|
||
|
|
set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH
|
||
|
|
"Path where built compiler-rt libraries should be installed.")
|
||
|
|
else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
|
||
|
|
set(COMPILER_RT_OUTPUT_LIBRARY_DIR
|
||
|
|
${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR})
|
||
|
|
- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}")
|
||
|
|
+ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}/${COMPILER_RT_OS_DIR}")
|
||
|
|
set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH
|
||
|
|
"Path where built compiler-rt libraries should be installed.")
|
||
|
|
endif()
|