[CMake] Rename RUNTIMES_BUILD to LLVM_RUNTIMES_BUILD

This avoid potential conflict with other internal variables.

Differential Revision: https://reviews.llvm.org/D97838
This commit is contained in:
Petr Hosek 2021-03-03 00:39:50 -08:00
parent 3c62198c61
commit 61a792b39b
6 changed files with 6 additions and 6 deletions

View File

@ -614,7 +614,7 @@ if(COMPILER_RT_INCLUDE_TESTS)
add_subdirectory(unittests)
add_subdirectory(test)
# Don't build llvm-lit for runtimes-build, it will clean up map_config.
if (COMPILER_RT_STANDALONE_BUILD AND NOT RUNTIMES_BUILD)
if (COMPILER_RT_STANDALONE_BUILD AND NOT LLVM_RUNTIMES_BUILD)
# If we have a valid source tree, generate llvm-lit into the bin directory.
# The user can still choose to have the check targets *use* a different lit
# by specifying -DLLVM_EXTERNAL_LIT, but we generate it regardless.

View File

@ -534,7 +534,7 @@ macro(add_custom_libcxx name prefix)
if(LIBCXX_USE_TOOLCHAIN)
set(compiler_args -DCMAKE_C_COMPILER=${COMPILER_RT_TEST_COMPILER}
-DCMAKE_CXX_COMPILER=${COMPILER_RT_TEST_CXX_COMPILER})
if(NOT COMPILER_RT_STANDALONE_BUILD AND NOT RUNTIMES_BUILD)
if(NOT COMPILER_RT_STANDALONE_BUILD AND NOT LLVM_RUNTIMES_BUILD)
set(toolchain_deps $<TARGET_FILE:clang>)
set(force_deps DEPENDS $<TARGET_FILE:clang>)
endif()

View File

@ -143,7 +143,7 @@ macro(clang_compiler_add_cxx_check)
COMMAND bash -c "${CMD}"
COMMENT "Checking that just-built clang can find C++ headers..."
VERBATIM)
if (NOT COMPILER_RT_STANDALONE_BUILD AND NOT RUNTIMES_BUILD)
if (NOT COMPILER_RT_STANDALONE_BUILD AND NOT LLVM_RUNTIMES_BUILD)
ADD_DEPENDENCIES(CompilerRTUnitTestCheckCxx clang)
endif()
endif()

View File

@ -18,7 +18,7 @@ endif()
# When ANDROID, we build tests with the host compiler (i.e. CMAKE_C_COMPILER),
# and run tests with tools from the host toolchain.
if(NOT ANDROID)
if(NOT COMPILER_RT_STANDALONE_BUILD AND NOT RUNTIMES_BUILD)
if(NOT COMPILER_RT_STANDALONE_BUILD AND NOT LLVM_RUNTIMES_BUILD)
# Use LLVM utils and Clang from the same build tree.
list(APPEND SANITIZER_COMMON_LIT_TEST_DEPS
clang clang-resource-headers FileCheck count not llvm-config llvm-nm llvm-objdump

View File

@ -6,7 +6,7 @@ set(CRT_TEST_DEPS)
if(NOT COMPILER_RT_STANDALONE_BUILD)
list(APPEND CRT_TEST_DEPS crt)
endif()
if(NOT COMPILER_RT_STANDALONE_BUILD AND NOT RUNTIMES_BUILD)
if(NOT COMPILER_RT_STANDALONE_BUILD AND NOT LLVM_RUNTIMES_BUILD)
# Use LLVM utils and Clang from the same build tree.
list(APPEND CRT_TEST_DEPS
clang clang-resource-headers FileCheck not llvm-config)

View File

@ -99,7 +99,7 @@ if(CMAKE_HOST_APPLE AND APPLE)
endif()
# This can be used to detect whether we're in the runtimes build.
set(RUNTIMES_BUILD ON)
set(LLVM_RUNTIMES_BUILD ON)
foreach(entry ${runtimes})
get_filename_component(projName ${entry} NAME)