[llvm] e4e281e - Revert "[bootstrap] Allow passing options to sub-builds for all targets"

[Petr Hosek via llvm-commits]

Author: Petr Hosek
Date: 2022-03-21T22:21:30-07:00
New Revision: e4e281eae93346b3fdc70a4808d5984ef049406b

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

LOG: Revert "[bootstrap] Allow passing options to sub-builds for all targets"

This reverts commit 240e06dfe77feabe38a03cbb1c94875639d0f9ff.

Added: 
    

Modified: 
    libcxx/utils/ci/run-buildbot
    llvm/runtimes/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot
index 6ba1b149a4708..c58c1fa6c84e6 100755
--- a/libcxx/utils/ci/run-buildbot
+++ b/libcxx/utils/ci/run-buildbot
@@ -462,7 +462,7 @@ bootstrapping-build)
           -DLLVM_TARGETS_TO_BUILD="host" \
           -DRUNTIMES_BUILD_ALLOW_DARWIN=ON \
           -DLLVM_ENABLE_ASSERTIONS=ON \
-          -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
+          -DRUNTIMES_LIBUNWIND_TEST_CONFIG="llvm-libunwind-shared.cfg.in"
 
     echo "+++ Running the libc++ and libc++abi tests"
     ${NINJA} -C "${BUILD_DIR}" check-runtimes

diff  --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
index ae2af14f26269..9ee124a5616cc 100644
--- a/llvm/runtimes/CMakeLists.txt
+++ b/llvm/runtimes/CMakeLists.txt
@@ -340,17 +340,6 @@ function(runtime_register_target name target)
     endforeach()
   endif()
 
-  # If we're passed any option like <project>_FOO, pass it through to the sub-builds.
-  foreach(runtime ${LLVM_ENABLE_RUNTIMES})
-    string(TOUPPER "${runtime}" runtime_upper)
-    foreach(variableName ${variableNames})
-      if (variableName MATCHES "^${runtime_upper}_.+")
-        string(REPLACE ";" "|" escaped_value "${${variableName}}")
-        list(APPEND ${name}_extra_args "-D${variableName}=${escaped_value}")
-      endif()
-    endforeach()
-  endforeach()
-
   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})