Skip to content

[compiler-rt] Add some missing dependencies on Windows #155019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 22, 2025
Merged

[compiler-rt] Add some missing dependencies on Windows #155019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions llvm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1376,6 +1376,17 @@ if( LLVM_INCLUDE_TOOLS )
add_subdirectory(tools)
endif()

# We need to setup KillTheDoctor before setting up the runtimes build because
# the runtimes build needs to add a KillTheDoctor dep for compiler-rt on
# Windows.
if (LLVM_INCLUDE_TESTS)
if (WIN32)
# This utility is used to prevent crashing tests from calling Dr. Watson on
# Windows.
add_subdirectory(utils/KillTheDoctor)
endif()
endif()

if( LLVM_INCLUDE_RUNTIMES )
add_subdirectory(runtimes)
endif()
Expand All @@ -1400,12 +1411,6 @@ if( LLVM_INCLUDE_TESTS )
add_subdirectory(test)
add_subdirectory(unittests)

if (WIN32)
# This utility is used to prevent crashing tests from calling Dr. Watson on
# Windows.
add_subdirectory(utils/KillTheDoctor)
endif()

umbrella_lit_testsuite_end(check-all)
get_property(LLVM_ALL_LIT_DEPENDS GLOBAL PROPERTY LLVM_ALL_LIT_DEPENDS)
get_property(LLVM_ALL_ADDITIONAL_TEST_DEPENDS
Expand Down
5 changes: 5 additions & 0 deletions llvm/runtimes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,8 +482,10 @@ if(build_runtimes)
llvm-lto
llvm-jitlink
llvm-nm
llvm-strip
llvm-objdump
llvm-profdata
llvm-readobj
llvm-size
llvm-symbolizer
llvm-xray
Expand All @@ -499,6 +501,9 @@ if(build_runtimes)
list(APPEND extra_deps ${dep})
endif()
endforeach()
if(WIN32)
list(APPEND extra_deps KillTheDoctor)
endif()
endif()

# Forward user-provived system configuration to runtimes for requirement introspection.
Expand Down