Skip to content

Commit e4b1813

Browse files
authored
Fix deps for clean "ninja check-compiler-rt" (#98266)
Without the patch even FileCheck is missing.
1 parent ed8565c commit e4b1813

File tree

1 file changed

+31
-21
lines changed

1 file changed

+31
-21
lines changed

llvm/runtimes/CMakeLists.txt

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,35 @@ if(build_runtimes)
444444
set(extra_deps "")
445445
set(extra_cmake_args "")
446446

447+
if(LLVM_INCLUDE_TESTS)
448+
foreach(dep FileCheck
449+
clang
450+
count
451+
lld
452+
lli
453+
llvm-cov
454+
llvm-lto
455+
llvm-jitlink
456+
llvm-nm
457+
llvm-objdump
458+
llvm-profdata
459+
llvm-size
460+
llvm-symbolizer
461+
llvm-xray
462+
not
463+
obj2yaml
464+
opt
465+
sancov
466+
sanstats
467+
llvm_gtest_main
468+
llvm_gtest
469+
split-file)
470+
if(TARGET ${dep})
471+
list(APPEND extra_deps ${dep})
472+
endif()
473+
endforeach()
474+
endif()
475+
447476
# Forward user-provived system configuration to runtimes for requirement introspection.
448477
# CMAKE_PREFIX_PATH is the search path for CMake packages.
449478
if(CMAKE_PREFIX_PATH)
@@ -612,29 +641,10 @@ if(build_runtimes)
612641
if(LLVM_INCLUDE_TESTS)
613642
set_property(GLOBAL APPEND PROPERTY LLVM_ALL_ADDITIONAL_TEST_DEPENDS runtimes-test-depends)
614643

615-
set(RUNTIMES_TEST_DEPENDS
616-
FileCheck
617-
count
618-
llvm-cov
619-
llvm-lto
620-
llvm-nm
621-
llvm-objdump
622-
llvm-profdata
623-
llvm-size
624-
llvm-xray
625-
not
626-
obj2yaml
627-
opt
628-
sancov
629-
sanstats
630-
llvm_gtest_main
631-
llvm_gtest
632-
split-file
633-
)
634644
foreach(target ${test_targets} ${SUB_CHECK_TARGETS})
635-
add_dependencies(${target} ${RUNTIMES_TEST_DEPENDS})
645+
add_dependencies(${target} ${extra_deps})
636646
endforeach()
637647

638-
set_property(GLOBAL APPEND PROPERTY LLVM_ALL_ADDITIONAL_TEST_TARGETS runtimes ${RUNTIMES_TEST_DEPENDS})
648+
set_property(GLOBAL APPEND PROPERTY LLVM_ALL_ADDITIONAL_TEST_TARGETS runtimes ${extra_deps})
639649
endif()
640650
endif()

0 commit comments

Comments
 (0)