aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@compnerd.org>2020-02-02 16:18:00 -0800
committerSaleem Abdulrasool <compnerd@compnerd.org>2020-02-02 16:18:00 -0800
commita43bf8078861ae816b45d94f7012a7ea01a2e5eb (patch)
tree59e888850190f0f734b1083f3588000ab7ce34f0
parentd24d8af320fd8977f085ee5ceafadaad98f76bf0 (diff)
downloadllvm-a43bf8078861ae816b45d94f7012a7ea01a2e5eb.zip
llvm-a43bf8078861ae816b45d94f7012a7ea01a2e5eb.tar.gz
llvm-a43bf8078861ae816b45d94f7012a7ea01a2e5eb.tar.bz2
build: attempt to repair the build
The change in 9b84dabc5f36f7e027c62b5c00ea97e21cfcacdd uses a newer syntax which not all the builders support. Use an explicit `OR` over the languages instead to repair the builders.
-rw-r--r--llvm/cmake/modules/HandleLLVMOptions.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake
index 0942bb9..cd48f93 100644
--- a/llvm/cmake/modules/HandleLLVMOptions.cmake
+++ b/llvm/cmake/modules/HandleLLVMOptions.cmake
@@ -59,7 +59,7 @@ if( LLVM_ENABLE_ASSERTIONS )
if( NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG" )
# NOTE: use `add_compile_options` rather than `add_definitions` since
# `add_definitions` does not support generator expressions.
- add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-UNDEBUG>)
+ add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-UNDEBUG>)
# Also remove /D NDEBUG to avoid MSVC warnings about conflicting defines.
foreach (flags_var_to_scrub