Skip to content

Commit b707b89

Browse files
author
Harlan Haskins
authored
Merge pull request #20554 from harlanhaskins/swiftsyntaxn't
[CMake] Remove swift-syntax install component
2 parents 25c6c16 + 0a861af commit b707b89

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

cmake/modules/SwiftComponents.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
# * stdlib -- the Swift standard library.
5757
# * stdlib-experimental -- the Swift standard library module for experimental
5858
# APIs.
59-
# * swift-syntax -- the Swift module for the libSyntax Swift API
6059
# * sdk-overlay -- the Swift SDK overlay.
6160
# * editor-integration -- scripts for Swift integration in IDEs other than
6261
# Xcode;
@@ -66,7 +65,7 @@
6665
# * toolchain-dev-tools -- install development tools useful in a shared toolchain
6766
# * dev -- headers and libraries required to use Swift compiler as a library.
6867
set(_SWIFT_DEFINED_COMPONENTS
69-
"autolink-driver;compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;stdlib;stdlib-experimental;swift-syntax;sdk-overlay;editor-integration;tools;testsuite-tools;toolchain-dev-tools;dev;license;sourcekit-xpc-service;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers")
68+
"autolink-driver;compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;stdlib;stdlib-experimental;sdk-overlay;editor-integration;tools;testsuite-tools;toolchain-dev-tools;dev;license;sourcekit-xpc-service;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers")
7069

7170
macro(swift_configure_components)
7271
# Set the SWIFT_INSTALL_COMPONENTS variable to the default value if it is not passed in via -D

utils/build-presets.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,7 @@ test-installable-package
10701070
# If someone uses this for incremental builds, force reconfiguration.
10711071
reconfigure
10721072

1073-
swift-install-components=compiler;clang-builtin-headers;stdlib;swift-syntax;sdk-overlay;license;sourcekit-xpc-service;swift-remote-mirror;swift-remote-mirror-headers
1073+
swift-install-components=compiler;clang-builtin-headers;stdlib;sdk-overlay;license;sourcekit-xpc-service;swift-remote-mirror;swift-remote-mirror-headers
10741074
llvm-install-components=llvm-cov;llvm-profdata;IndexStore
10751075

10761076
# Path to the .tar.gz package we would create.

0 commit comments

Comments
 (0)