Skip to content

Commit f1b8c91

Browse files
authored
Merge pull request swiftlang#22860 from davezarzycki/install_FileCheck_fix
[CMake] Don't install FileCheck by default
2 parents ac7c85a + 6b25618 commit f1b8c91

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

cmake/modules/SwiftComponents.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "dev")
7575
# These clang header options conflict with 'clang-builtin-headers'.
7676
list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "clang-resource-dir-symlink")
7777
list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "clang-builtin-headers-in-clang-resource-dir")
78+
# This conflicts with LLVM itself when doing unified builds.
79+
list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "toolchain-dev-tools")
7880
# The sourcekit install variants are currently mutually exclusive.
7981
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
8082
list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "sourcekit-inproc")

0 commit comments

Comments
 (0)