tjh.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 3d6225646fe6..9b5d0b15af13 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -33,10 +33,22 @@ if(LLD_BUILT_STANDALONE)
6 find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}")
7 list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}")
8
9- # Turn into CACHE PATHs for overwriting
10- set(LLVM_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")
11- set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}" CACHE PATH "Path to LLVM build tree")
12- set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree")
13+ # We can't check LLVM_CONFIG here, because find_package(LLVM ...) also sets
14+ # LLVM_CONFIG.
15+ if (NOT LLVM_CONFIG_FOUND)
16+ # Pull values from LLVMConfig.cmake. We can drop this once the llvm-config
17+ # path is removed.
18+ set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
19+ set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}")
20+ # N.B. this is just a default value, the CACHE PATHs below can be overridden.
21+ set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm")
22+ else()
23+ set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}")
24+ endif()
25+
26+ set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")
27+ set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree")
28+ set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree")
29
30 find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}
31 NO_DEFAULT_PATH)
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)