[cmake] Add a separate CMake var to control profile runtime

Make it possible to control building profile runtime separately from
other options. Before r313549, the profile runtime building was
controlled along with sanitizers. However, since that commit it is built
unconditionally which results in multiple builds for people building
different runtimes separately.

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

llvm-svn: 314646
This commit is contained in:
Michal Gorny 2017-10-02 05:03:55 +00:00
parent daf5adc6c1
commit 806b8d56a2
3 changed files with 5 additions and 3 deletions

View File

@ -38,6 +38,8 @@ option(COMPILER_RT_BUILD_XRAY "Build xray" ON)
mark_as_advanced(COMPILER_RT_BUILD_XRAY)
option(COMPILER_RT_BUILD_LIBFUZZER "Build libFuzzer" ON)
mark_as_advanced(COMPILER_RT_BUILD_LIBFUZZER)
option(COMPILER_RT_BUILD_PROFILE "Build profile runtime" ON)
mark_as_advanced(COMPILER_RT_BUILD_PROFILE)
option(COMPILER_RT_BUILD_XRAY_NO_PREINIT "Build xray with no preinit patching" OFF)
mark_as_advanced(COMPILER_RT_BUILD_XRAY_NO_PREINIT)

View File

@ -41,7 +41,7 @@ if(COMPILER_RT_BUILD_SANITIZERS)
endforeach()
endif()
if (COMPILER_RT_HAS_PROFILE)
if(COMPILER_RT_BUILD_PROFILE AND COMPILER_RT_HAS_PROFILE)
compiler_rt_build_runtime(profile)
endif()

View File

@ -10,7 +10,7 @@ configure_lit_site_cfg(
set(SANITIZER_COMMON_LIT_TEST_DEPS)
if (COMPILER_RT_HAS_PROFILE)
if(COMPILER_RT_BUILD_PROFILE AND COMPILER_RT_HAS_PROFILE)
list(APPEND SANITIZER_COMMON_LIT_TEST_DEPS profile)
endif()
@ -72,7 +72,7 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS)
endif()
endforeach()
endif()
if (COMPILER_RT_HAS_PROFILE)
if(COMPILER_RT_BUILD_PROFILE AND COMPILER_RT_HAS_PROFILE)
compiler_rt_test_runtime(profile)
endif()
if(COMPILER_RT_BUILD_XRAY)