Skip to content

Commit af499b4

Browse files
DavidSpickettgithub-actions[bot]
authored andcommitted
Automerge: [llvm][cmake] Remove version number from runtimes in PROJECTS warnings (#152457)
Judging from the reaction to llvm/llvm-project#152302, we are not ready to make this a fatal error. Remove the specific version number, and update the libc message to match the others' wording. (cherry picked from commit 6cd6de5)
2 parents 5846b64 + b398447 commit af499b4

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

llvm/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,28 +180,29 @@ if ("flang" IN_LIST LLVM_ENABLE_PROJECTS)
180180
endif()
181181

182182
if ("libc" IN_LIST LLVM_ENABLE_PROJECTS)
183-
message(WARNING "Using LLVM_ENABLE_PROJECTS=libc is deprecated. Please use "
183+
message(WARNING "Using LLVM_ENABLE_PROJECTS=libc is deprecated now, and will "
184+
"become a fatal error in a future release. Please use "
184185
"-DLLVM_ENABLE_RUNTIMES=libc or see the instructions at "
185186
"https://libc.llvm.org/ for building the runtimes.")
186187
endif()
187188

188189
if ("compiler-rt" IN_LIST LLVM_ENABLE_PROJECTS)
189190
message(WARNING "Using LLVM_ENABLE_PROJECTS=compiler-rt is deprecated now, and will "
190-
"become a fatal error in the LLVM 21 release. Please use "
191+
"become a fatal error in a future release. Please use "
191192
"-DLLVM_ENABLE_RUNTIMES=compiler-rt or see the instructions at "
192193
"https://compiler-rt.llvm.org/ for building the runtimes.")
193194
endif()
194195

195196
if ("offload" IN_LIST LLVM_ENABLE_PROJECTS)
196197
message(WARNING "Using LLVM_ENABLE_PROJECTS=offload is deprecated now, and will "
197-
"become a fatal error in the LLVM 21 release. Please use "
198+
"become a fatal error in a future release. Please use "
198199
"-DLLVM_ENABLE_RUNTIMES=offload or see the instructions at "
199200
"https://openmp.llvm.org/ for building the runtimes.")
200201
endif()
201202

202203
if ("openmp" IN_LIST LLVM_ENABLE_PROJECTS)
203204
message(WARNING "Using LLVM_ENABLE_PROJECTS=openmp is deprecated now, and will "
204-
"become a fatal error in the LLVM 21 release. Please use "
205+
"become a fatal error in a future release. Please use "
205206
"-DLLVM_ENABLE_RUNTIMES=openmp or see the instructions at "
206207
"https://openmp.llvm.org/ for building the runtimes.")
207208
endif()
@@ -214,7 +215,7 @@ endif ()
214215

215216
if ("libclc" IN_LIST LLVM_ENABLE_PROJECTS)
216217
message(WARNING "Using LLVM_ENABLE_PROJECTS=libclc is deprecated now, and will "
217-
"become a fatal error in the LLVM 21 release. Please use "
218+
"become a fatal error in a future release. Please use "
218219
"-DLLVM_ENABLE_RUNTIMES=libclc or see the instructions at "
219220
"https://libclc.llvm.org/ for building the runtimes.")
220221
endif()

0 commit comments

Comments
 (0)