tjh.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index dcc649629a4b..58dca54642e4 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -70,13 +70,15 @@ if(LLD_BUILT_STANDALONE)
6 if (NOT LLVM_CONFIG_FOUND)
7 # Pull values from LLVMConfig.cmake. We can drop this once the llvm-config
8 # path is removed.
9- set(MAIN_INCLUDE_DIR "${LLVM_INCLUDE_DIR}")
10+ set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
11 set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}")
12 # N.B. this is just a default value, the CACHE PATHs below can be overridden.
13 set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm")
14+ else()
15+ set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}")
16 endif()
17
18- set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include")
19+ set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")
20 set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree")
21 set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree")
22
23@@ -95,7 +97,7 @@ if(LLD_BUILT_STANDALONE)
24
25 set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
26
27- include_directories("${LLVM_BINARY_DIR}/include" ${LLVM_INCLUDE_DIRS})
28+ include_directories(${LLVM_INCLUDE_DIRS})
29 link_directories(${LLVM_LIBRARY_DIRS})
30
31 if(LLVM_INCLUDE_TESTS)
32diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake
33index d3924f7243d4..42a7cd62281c 100644
34--- a/cmake/modules/AddLLD.cmake
35+++ b/cmake/modules/AddLLD.cmake
36@@ -18,8 +18,8 @@ macro(add_lld_library name)
37 install(TARGETS ${name}
38 COMPONENT ${name}
39 ${export_to_lldtargets}
40- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
41- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
42+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"
43+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"
44 RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
45
46 if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES)