[llvm] r371566 - Adding support for overriding LLVM_ENABLE_RUNTIMES for runtimes builds.

Puyan Lotfi via llvm-commits llvm-commits at lists.llvm.org
Tue Sep 10 15:55:47 PDT 2019


Author: zer0
Date: Tue Sep 10 15:55:47 2019
New Revision: 371566

URL: http://llvm.org/viewvc/llvm-project?rev=371566&view=rev
Log:
Adding support for overriding LLVM_ENABLE_RUNTIMES for runtimes builds.

On some platforms, certain runtimes are not supported. For runtimes builds of
those platforms it would be nice if we could disable certain runtimes (ie
libunwind on Windows).



Differential Revision: https://reviews.llvm.org/D67195

Modified:
    llvm/trunk/runtimes/CMakeLists.txt

Modified: llvm/trunk/runtimes/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/runtimes/CMakeLists.txt?rev=371566&r1=371565&r2=371566&view=diff
==============================================================================
--- llvm/trunk/runtimes/CMakeLists.txt (original)
+++ llvm/trunk/runtimes/CMakeLists.txt Tue Sep 10 15:55:47 2019
@@ -460,6 +460,10 @@ else() # if this is included from LLVM's
       endif()
     endforeach()
 
+    if(NOT RUNTIMES_${name}_LLVM_ENABLE_RUNTIMES)
+      list(APPEND ${name}_extra_args -DLLVM_ENABLE_RUNTIMES=${LLVM_ENABLE_RUNTIMES})
+    endif()
+
     if(target IN_LIST LLVM_RUNTIME_BUILD_ID_LINK_TARGETS)
       list(APPEND EXTRA_ARGS STRIP_TOOL ${CMAKE_CURRENT_BINARY_DIR}/llvm-strip-link)
     endif()
@@ -482,7 +486,6 @@ else() # if this is included from LLVM's
                                         -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
                                         -DLLVM_RUNTIMES_TARGET=${name}
                                         ${${name}_extra_args}
-                             PASSTHROUGH_PREFIXES LLVM_ENABLE_RUNTIMES
                              TOOLCHAIN_TOOLS clang lld llvm-ar llvm-ranlib llvm-nm llvm-objcopy llvm-objdump llvm-strip
                              EXTRA_TARGETS ${${name}_extra_targets}
                                            ${${name}_test_targets}




More information about the llvm-commits mailing list