tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index c5003b5efa1d..4fffb9721284 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 1ada0ab30ba0..b4be6c4a3c73 100644
16--- a/cmake/base-config-ix.cmake
17+++ b/cmake/base-config-ix.cmake
18@@ -66,7 +66,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@@ -98,23 +98,23 @@ 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()
43-extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" bin)
44+extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_BINDIR}")
45 set(COMPILER_RT_INSTALL_BINARY_DIR "${default_install_path}" CACHE PATH
46 "Path where built compiler-rt executables should be installed.")
47-extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" include)
48+extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_INCLUDEDIR}")
49 set(COMPILER_RT_INSTALL_INCLUDE_DIR "${default_install_path}" CACHE PATH
50 "Path where compiler-rt headers should be installed.")
51-extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" share)
52+extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_DATADIR}")
53 set(COMPILER_RT_INSTALL_DATA_DIR "${default_install_path}" CACHE PATH
54 "Path where compiler-rt data files should be installed.")
55