Skip to content

Commit 9f1c0dc

Browse files
pca006132RossComputerGuy
authored andcommitted
[BOLT] CMakeLists.txt: drop use of llvm-config
1 parent c7a35f8 commit 9f1c0dc

File tree

1 file changed

+3
-18
lines changed

1 file changed

+3
-18
lines changed

bolt/CMakeLists.txt

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,9 @@ if(BOLT_BUILT_STANDALONE)
3737
list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}")
3838

3939
# Turn into CACHE PATHs for overwritting
40-
41-
# We can't check LLVM_CONFIG here, because find_package(LLVM ...) also sets
42-
# LLVM_CONFIG.
43-
if (NOT LLVM_CONFIG_FOUND)
44-
# Pull values from LLVMConfig.cmake. We can drop this once the llvm-config
45-
# path is removed.
46-
set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
47-
set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}")
48-
# N.B. this is just a default value, the CACHE PATHs below can be overridden.
49-
set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm")
50-
else()
51-
set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}")
52-
endif()
53-
54-
set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")
55-
set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree")
56-
set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree")
57-
40+
set(LLVM_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")
41+
set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}" CACHE PATH "Path to LLVM build tree")
42+
set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree")
5843
set(LLVM_TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}" CACHE PATH "Path to llvm/bin")
5944
set(LLVM_LIBRARY_DIR "${LLVM_LIBRARY_DIR}" CACHE PATH "Path to llvm/lib")
6045

0 commit comments

Comments
 (0)