tjh.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 3a41aa43e406..f000cee6eae0 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -5,6 +5,8 @@
6
7 cmake_minimum_required(VERSION 3.13.4)
8
9+include(GNUInstallDirs)
10+
11 # Check if compiler-rt is built as a standalone project.
12 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD)
13 project(CompilerRT C CXX ASM)
14diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake
15index d7b0124f3546..3e111146df4d 100644
16--- a/cmake/base-config-ix.cmake
17+++ b/cmake/base-config-ix.cmake
18@@ -67,7 +67,7 @@ if (LLVM_TREE_AVAILABLE)
19 else()
20 # Take output dir and install path from the user.
21 set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH
22- "Path where built compiler-rt libraries should be stored.")
23+ "Path where built compiler-rt build artifacts should be stored.")
24 set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH
25 "Path where built compiler-rt executables should be stored.")
26 set(COMPILER_RT_INSTALL_PATH "" CACHE PATH
27@@ -99,13 +99,13 @@ endif()
28 if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
29 set(COMPILER_RT_OUTPUT_LIBRARY_DIR
30 ${COMPILER_RT_OUTPUT_DIR}/lib)
31- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib)
32+ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}")
33 set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH
34 "Path where built compiler-rt libraries should be installed.")
35 else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
36 set(COMPILER_RT_OUTPUT_LIBRARY_DIR
37 ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR})
38- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}")
39+ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}/${COMPILER_RT_OS_DIR}")
40 set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH
41 "Path where built compiler-rt libraries should be installed.")
42 endif()