Skip to content

Commit 78ef82f

Browse files
committed
[Build] Make sure to install SwiftSyntax into the toolchain
... otherwise we build a broken compiler in the toolchain, because the shared libraries for SwiftSyntax aren't present.
1 parent 85cc836 commit 78ef82f

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

utils/build-presets.ini

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ build-swift-stdlib-unittest-extra
3838

3939
install-llvm
4040
install-swift
41+
install-swiftsyntax
4142

4243
skip-test-cmark
4344

@@ -384,6 +385,7 @@ install-swift
384385
install-llbuild
385386
install-swiftpm
386387
install-swift-driver
388+
install-swiftsyntax
387389
install-libcxx
388390

389391
[preset: buildbot_incremental,tools=RA,stdlib=RA,apple_silicon]
@@ -818,6 +820,7 @@ install-lldb
818820
install-llbuild
819821
install-swiftpm
820822
install-swift-driver
823+
install-swiftsyntax
821824
install-xctest
822825
install-libicu
823826
install-prefix=/usr
@@ -948,6 +951,7 @@ host-test
948951
install-prefix=/usr
949952
install-llvm
950953
install-swift
954+
install-swiftsyntax
951955

952956
skip-test-linux
953957
skip-build-benchmarks
@@ -1058,6 +1062,7 @@ install-llbuild
10581062
install-foundation
10591063
install-swiftpm
10601064
install-swift-driver
1065+
install-swiftsyntax
10611066
install-xctest
10621067
install-prefix=/usr
10631068
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;dev
@@ -1126,6 +1131,7 @@ install-llbuild
11261131
install-libicu
11271132
install-swiftpm
11281133
install-swift-driver
1134+
install-swiftsyntax
11291135
install-foundation
11301136
install-libdispatch
11311137
install-xctest
@@ -1536,6 +1542,7 @@ libcxx
15361542
# Install swift and libcxx
15371543
install-llvm
15381544
install-swift
1545+
install-swiftsyntax
15391546
install-libcxx
15401547

15411548
# Build Playground support
@@ -1591,6 +1598,7 @@ install-swift
15911598
install-llbuild
15921599
install-swiftpm
15931600
install-swift-driver
1601+
install-swiftsyntax
15941602
install-libcxx
15951603
install-swiftdocc
15961604

@@ -1658,6 +1666,7 @@ install-llvm
16581666
install-swift
16591667
install-llbuild
16601668
install-swiftpm
1669+
install-swiftsyntax
16611670
install-libcxx
16621671

16631672
skip-test-swift
@@ -1945,6 +1954,7 @@ install-llvm
19451954
install-swift
19461955
install-llbuild
19471956
install-swiftpm
1957+
install-swiftsyntax
19481958
install-xctest
19491959
install-sourcekit-lsp
19501960

@@ -1977,6 +1987,7 @@ skip-build-llbuild
19771987
skip-build-benchmarks
19781988
install-llvm
19791989
install-swift
1990+
install-swiftsyntax
19801991
install-prefix=%(install_toolchain_dir)s/usr
19811992
build-swift-examples=0
19821993
build-swift-tools=0
@@ -2621,6 +2632,7 @@ install-llvm
26212632
install-swift
26222633
install-swiftpm
26232634
install-swift-driver
2635+
install-swiftsyntax
26242636
reconfigure
26252637
verbose-build
26262638
skip-build-benchmarks

utils/swift_build_support/swift_build_support/products/earlyswiftsyntax.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def should_install(self, host_target):
8383
Whether or not this product should be installed with the given
8484
arguments.
8585
"""
86-
return self.args.install_all
86+
return self.args.install_swiftsyntax
8787

8888
def install(self, host_target):
8989
"""

0 commit comments

Comments
 (0)