Skip to content

Commit c9e21d7

Browse files
committed
[BOLT] CMakeLists.txt: drop use of llvm-config
1 parent 1f36a62 commit c9e21d7

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
@@ -35,24 +35,9 @@ if(BOLT_BUILT_STANDALONE)
3535
list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}")
3636

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

0 commit comments

Comments
 (0)