From: Petr Hosek <phosek@chromium.org>
Date: Wed, 11 Sep 2019 00:43:35 +0000 (+0000)
Subject: Revert "Adding support for overriding LLVM_ENABLE_RUNTIMES for runtimes builds."
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8cf454df095daea8c8400525a747c30b80882854;p=llvm

Revert "Adding support for overriding LLVM_ENABLE_RUNTIMES for runtimes builds."

This reverts commit r371566: this doesn't correctly handle the case
where LLVM_ENABLE_RUNTIMES contains a list of values.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@371579 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt
index 08fd7ed81a0..552ab7b2a88 100644
--- a/runtimes/CMakeLists.txt
+++ b/runtimes/CMakeLists.txt
@@ -460,10 +460,6 @@ else() # if this is included from LLVM's CMake
       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()
@@ -486,6 +482,7 @@ else() # if this is included from LLVM's CMake
                                         -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}