Skip to content

Commit dc5a7ae

Browse files
committed
[CIR] Remove LLVM_ENABLE_PROJECTS support
ghstack-source-id: 8555196 Pull Request resolved: #424
1 parent 758a282 commit dc5a7ae

File tree

1 file changed

+1
-19
lines changed

1 file changed

+1
-19
lines changed

llvm/CMakeLists.txt

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

145-
if ("cir" IN_LIST LLVM_ENABLE_PROJECTS)
146-
if (NOT "mlir" IN_LIST LLVM_ENABLE_PROJECTS)
147-
message(STATUS "Enabling MLIR as a dependency to CIR")
148-
list(APPEND LLVM_ENABLE_PROJECTS "mlir")
149-
endif()
150-
151-
if (NOT "clang" IN_LIST LLVM_ENABLE_PROJECTS)
152-
message(FATAL_ERROR "Clang is not enabled, but is required to use CIR")
153-
endif()
154-
endif()
155-
156145
# Select the runtimes to build
157146
#
158147
# As we migrate runtimes to using the bootstrapping build, the set of default runtimes
@@ -233,13 +222,6 @@ if (LLVM_ENABLE_PROJECTS_USED OR NOT LLVM_ENABLE_PROJECTS STREQUAL "")
233222
string(REGEX REPLACE "-" "_" upper_proj ${upper_proj})
234223
if ("${proj}" IN_LIST LLVM_ENABLE_PROJECTS)
235224
message(STATUS "${proj} project is enabled")
236-
# ClangIR is integrated inside clang and also provides the cir-opt,
237-
# it needs some special handling.
238-
if ("${proj}" STREQUAL "cir")
239-
set(CLANG_ENABLE_CIR ON)
240-
continue()
241-
endif()
242-
243225
set(SHOULD_ENABLE_PROJECT TRUE)
244226
set(PROJ_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../${proj}")
245227
if(NOT EXISTS "${PROJ_DIR}" OR NOT IS_DIRECTORY "${PROJ_DIR}")

0 commit comments

Comments
 (0)