[CMake] Quick-Fix FileCheck target does not exist when building against LLVM install-tree with COMPILER_RT_INCLUDE_TESTS=ON

[sgraenitz]

Summary

The issue came up during release testing for LLVM 8: https://bugs.llvm.org/show_bug.cgi?id=40443

[mgorny]

Can't call that a really proper fix but I guess it's good enough for me. As for running tests, it's non trivial, so I'll try them later using our ebuilds.

[mgorny]

(I've also tested the patch now and everything works as expected now)

[filcab]

Hah, I had the exact same fix on our private branch.

I think this might create problems if you generate files from cmake and immediately run ninja check-sanitizer (without building the rest of llvm). Can you check if that works? If so, it's an LGTM.

Thank you,
Filipe

[mgorny]

In D57224#1371281, @filcab wrote:

Hah, I had the exact same fix on our private branch.

I think this might create problems if you generate files from cmake and immediately run ninja check-sanitizer (without building the rest of llvm). Can you check if that works? If so, it's an LGTM.

if you are concerned about dependencies in non-standalone builds, they are handled separately from this. This addition was only done for COMPILER_RT_STANDALONE_BUILD.

[filcab]

In D57224#1371302, @mgorny wrote:

if you are concerned about dependencies in non-standalone builds, they are handled separately from this. This addition was only done for COMPILER_RT_STANDALONE_BUILD.

Right. Then LGTM.

[delcypher]

compiler-rt/trunk/test/CMakeLists.txt

17 ↗

(On Diff #183868)

Rather than deleting these lines, would this be more sensible?

if (NOT COMPILER_RT_STANDALONE_BUILD)
  list(APPEND SANITIZER_COMMON_LIT_TEST_DEPS FileCheck)
endif()

test/CMakeLists.txt

 # Needed for lit support in standalone builds.
 include(AddLLVM)
 
 configure_compiler_rt_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.common.configured.in
   ${CMAKE_CURRENT_BINARY_DIR}/lit.common.configured)
 
 # BlocksRuntime (and most of builtins) testsuites are not yet ported to lit.
 # add_subdirectory(BlocksRuntime)
 
 set(SANITIZER_COMMON_LIT_TEST_DEPS)
 
 if(COMPILER_RT_BUILD_PROFILE AND COMPILER_RT_HAS_PROFILE)
   list(APPEND SANITIZER_COMMON_LIT_TEST_DEPS profile)
 endif()
 
-if(COMPILER_RT_STANDALONE_BUILD)
-  list(APPEND SANITIZER_COMMON_LIT_TEST_DEPS FileCheck)
-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)
     # Use LLVM utils and Clang from the same build tree.
     list(APPEND SANITIZER_COMMON_LIT_TEST_DEPS
       clang clang-headers FileCheck count not llvm-config llvm-nm llvm-objdump
       llvm-readobj llvm-symbolizer compiler-rt-headers sancov)