Skip to content

Commit aa51171

Browse files
pca006132RossComputerGuy
authored andcommitted
[BOLT] CMakeLists.txt: drop use of llvm-config
1 parent 3c1a36e commit aa51171

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

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

0 commit comments

Comments
 (0)