Skip to content

Commit e3b9638

Browse files
committedOct 12, 2024
[CIR] Remove LLVM_ENABLE_PROJECTS support
ghstack-source-id: 855519648a4bf2dced501f96e6de1b9b164d85ad Pull Request resolved: #424

File tree

1 file changed

+1
-19
lines changed

1 file changed

+1
-19
lines changed
 

‎llvm/CMakeLists.txt

+1-19
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ endif()
116116
# LLVM_EXTERNAL_${project}_SOURCE_DIR using LLVM_ALL_PROJECTS
117117
# This allows an easy way of setting up a build directory for llvm and another
118118
# one for llvm+clang+... using the same sources.
119-
set(LLVM_ALL_PROJECTS "bolt;cir;clang;clang-tools-extra;compiler-rt;cross-project-tests;libc;libclc;lld;lldb;mlir;openmp;polly;pstl")
119+
set(LLVM_ALL_PROJECTS "bolt;clang;clang-tools-extra;compiler-rt;cross-project-tests;libc;libclc;lld;lldb;mlir;openmp;polly;pstl")
120120
# The flang project is not yet part of "all" projects (see C++ requirements)
121121
set(LLVM_EXTRA_PROJECTS "flang")
122122
# List of all known projects in the mono repo
@@ -144,17 +144,6 @@ if ("flang" IN_LIST LLVM_ENABLE_PROJECTS)
144144
endif()
145145
endif()
146146

147-
if ("cir" IN_LIST LLVM_ENABLE_PROJECTS)
148-
if (NOT "mlir" IN_LIST LLVM_ENABLE_PROJECTS)
149-
message(STATUS "Enabling MLIR as a dependency to CIR")
150-
list(APPEND LLVM_ENABLE_PROJECTS "mlir")
151-
endif()
152-
153-
if (NOT "clang" IN_LIST LLVM_ENABLE_PROJECTS)
154-
message(FATAL_ERROR "Clang is not enabled, but is required to use CIR")
155-
endif()
156-
endif()
157-
158147
# Select the runtimes to build
159148
#
160149
# As we migrate runtimes to using the bootstrapping build, the set of default runtimes
@@ -245,13 +234,6 @@ if (LLVM_ENABLE_PROJECTS_USED OR NOT LLVM_ENABLE_PROJECTS STREQUAL "")
245234
string(REGEX REPLACE "-" "_" upper_proj ${upper_proj})
246235
if ("${proj}" IN_LIST LLVM_ENABLE_PROJECTS)
247236
message(STATUS "${proj} project is enabled")
248-
# ClangIR is integrated inside clang and also provides the cir-opt,
249-
# it needs some special handling.
250-
if ("${proj}" STREQUAL "cir")
251-
set(CLANG_ENABLE_CIR ON)
252-
continue()
253-
endif()
254-
255237
set(SHOULD_ENABLE_PROJECT TRUE)
256238
set(PROJ_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../${proj}")
257239
if(NOT EXISTS "${PROJ_DIR}" OR NOT IS_DIRECTORY "${PROJ_DIR}")

0 commit comments

Comments
 (0)