[llvm] 0423ddf - [build] Fix LLVM_ENABLE_RUNTIMES override condition

Shoaib Meenai via llvm-commits llvm-commits at lists.llvm.org
Wed Jan 29 13:41:38 PST 2020


Author: Shoaib Meenai
Date: 2020-01-29T13:41:31-08:00
New Revision: 0423ddfb817a982e8e1055f94698af1f336686f5

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

LOG: [build] Fix LLVM_ENABLE_RUNTIMES override condition

I forgot to add parentheses in fa44d72b9e43, though I prefer the
expanded form anyway.

Added: 
    

Modified: 
    llvm/runtimes/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
index 8b911c2c2c5d..40869f0a12d2 100644
--- a/llvm/runtimes/CMakeLists.txt
+++ b/llvm/runtimes/CMakeLists.txt
@@ -466,7 +466,7 @@ else() # if this is included from LLVM's CMake
       endif()
     endforeach()
 
-    if(NOT RUNTIMES_${target}_LLVM_ENABLE_RUNTIMES OR RUNTIMES_${name}_LLVM_ENABLE_RUNTIMES)
+    if(NOT RUNTIMES_${name}_LLVM_ENABLE_RUNTIMES AND NOT RUNTIMES_${target}_LLVM_ENABLE_RUNTIMES)
       string(REPLACE ";" "|" LLVM_ENABLE_RUNTIMES_PASSTHROUGH "${LLVM_ENABLE_RUNTIMES}")
       list(APPEND ${name}_extra_args -DLLVM_ENABLE_RUNTIMES=${LLVM_ENABLE_RUNTIMES_PASSTHROUGH})
     endif()


        


More information about the llvm-commits mailing list