@@ -116,7 +116,7 @@ endif()
116
116
# LLVM_EXTERNAL_${project}_SOURCE_DIR using LLVM_ALL_PROJECTS
117
117
# This allows an easy way of setting up a build directory for llvm and another
118
118
# 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" )
120
120
# The flang project is not yet part of "all" projects (see C++ requirements)
121
121
set (LLVM_EXTRA_PROJECTS "flang" )
122
122
# List of all known projects in the mono repo
@@ -144,17 +144,6 @@ if ("flang" IN_LIST LLVM_ENABLE_PROJECTS)
144
144
endif ()
145
145
endif ()
146
146
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
-
158
147
# Select the runtimes to build
159
148
#
160
149
# 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 "")
245
234
string (REGEX REPLACE "-" "_" upper_proj ${upper_proj} )
246
235
if ("${proj} " IN_LIST LLVM_ENABLE_PROJECTS)
247
236
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
-
255
237
set (SHOULD_ENABLE_PROJECT TRUE )
256
238
set (PROJ_DIR "${CMAKE_CURRENT_SOURCE_DIR} /../${proj} " )
257
239
if (NOT EXISTS "${PROJ_DIR} " OR NOT IS_DIRECTORY "${PROJ_DIR} " )
0 commit comments