tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 858f5d5cfd7f..16c67d7062be 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -10,6 +10,8 @@ endif()
6
7 cmake_minimum_required(VERSION 3.13.4)
8
9+include(GNUInstallDirs)
10+
11 set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
12
13 # Add path for custom modules
14@@ -213,9 +215,9 @@ set(CMAKE_MODULE_PATH
15 if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
16 set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR})
17 set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE})
18- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH
19+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH
20 "Path where built libc++abi libraries should be installed.")
21- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH
22+ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
23 "Path where built libc++abi runtime libraries should be installed.")
24 if(LIBCXX_LIBDIR_SUBDIR)
25 string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR})
26@@ -224,16 +226,16 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
27 elseif(LLVM_LIBRARY_OUTPUT_INTDIR)
28 set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR})
29 set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
30- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH
31+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH
32 "Path where built libc++abi libraries should be installed.")
33- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH
34+ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
35 "Path where built libc++abi runtime libraries should be installed.")
36 else()
37 set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR})
38 set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX})
39- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH
40+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH
41 "Path where built libc++abi libraries should be installed.")
42- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH
43+ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
44 "Path where built libc++abi runtime libraries should be installed.")
45 endif()
46