[llvm] a43bf80 - build: attempt to repair the build

[Saleem Abdulrasool via llvm-commits]

Author: Saleem Abdulrasool
Date: 2020-02-02T16:18:00-08:00
New Revision: a43bf8078861ae816b45d94f7012a7ea01a2e5eb

URL: https://github.com/llvm/llvm-project/commit/a43bf8078861ae816b45d94f7012a7ea01a2e5eb
DIFF: https://github.com/llvm/llvm-project/commit/a43bf8078861ae816b45d94f7012a7ea01a2e5eb.diff

LOG: 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.

Added: 
    

Modified: 
    llvm/cmake/modules/HandleLLVMOptions.cmake

Removed: 
    


################################################################################
diff  --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake
index 0942bb98a26f..cd48f93f80ca 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