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

This reverts commit 240e06dfe7.
This commit is contained in:
Petr Hosek 2022-03-21 18:34:59 -07:00
parent ddc90da478
commit e4e281eae9
2 changed files with 1 additions and 12 deletions

View File

@ -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

View File

@ -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})