47 lines
2.0 KiB
Diff
47 lines
2.0 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index dcc649629a4b..58dca54642e4 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -70,13 +70,15 @@ if(LLD_BUILT_STANDALONE)
|
||
|
|
if (NOT LLVM_CONFIG_FOUND)
|
||
|
|
# Pull values from LLVMConfig.cmake. We can drop this once the llvm-config
|
||
|
|
# path is removed.
|
||
|
|
- set(MAIN_INCLUDE_DIR "${LLVM_INCLUDE_DIR}")
|
||
|
|
+ set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
|
||
|
|
set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}")
|
||
|
|
# N.B. this is just a default value, the CACHE PATHs below can be overridden.
|
||
|
|
set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm")
|
||
|
|
+ else()
|
||
|
|
+ set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}")
|
||
|
|
endif()
|
||
|
|
|
||
|
|
- set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include")
|
||
|
|
+ set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")
|
||
|
|
set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree")
|
||
|
|
set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree")
|
||
|
|
|
||
|
|
@@ -95,7 +97,7 @@ if(LLD_BUILT_STANDALONE)
|
||
|
|
|
||
|
|
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
|
||
|
|
|
||
|
|
- include_directories("${LLVM_BINARY_DIR}/include" ${LLVM_INCLUDE_DIRS})
|
||
|
|
+ include_directories(${LLVM_INCLUDE_DIRS})
|
||
|
|
link_directories(${LLVM_LIBRARY_DIRS})
|
||
|
|
|
||
|
|
if(LLVM_INCLUDE_TESTS)
|
||
|
|
diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake
|
||
|
|
index d3924f7243d4..42a7cd62281c 100644
|
||
|
|
--- a/cmake/modules/AddLLD.cmake
|
||
|
|
+++ b/cmake/modules/AddLLD.cmake
|
||
|
|
@@ -18,8 +18,8 @@ macro(add_lld_library name)
|
||
|
|
install(TARGETS ${name}
|
||
|
|
COMPONENT ${name}
|
||
|
|
${export_to_lldtargets}
|
||
|
|
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
|
||
|
|
- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
|
||
|
|
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"
|
||
|
|
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"
|
||
|
|
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
|
||
|
|
|
||
|
|
if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES)
|