@@ -18,6 +18,9 @@ dash-dash
18
18
19
19
swift-install-components =compiler; clang-builtin-headers;stdlib;sdk-overlay;parser-lib;editor-integration;tools;toolchain-tools;testsuite-tools;sourcekit-xpc-service;swift-remote-mirror;swift-remote-mirror-headers;
20
20
21
+ [preset: mixin_buildbot_install_components_with_clang]
22
+ swift-install-components =compiler; clang-resource-dir-symlink;stdlib;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-xpc-service;swift-remote-mirror;swift-remote-mirror-headers
23
+ llvm-install-components =llvm-cov; llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
21
24
22
25
[preset: mixin_buildbot_trunk_base]
23
26
# Build standard library and SDK overlay for iOS device and simulator.
322
325
watchos
323
326
324
327
[preset: buildbot_incremental,tools=RA,stdlib=RA]
325
- mixin-preset =buildbot_incremental_base_all_platforms
328
+ mixin-preset =
329
+ buildbot_incremental_base_all_platforms
330
+ mixin_buildbot_install_components_with_clang
326
331
327
332
build-subdir =buildbot_incremental
328
333
@@ -351,6 +356,7 @@ skip-test-watchos
351
356
install-swift
352
357
install-llbuild
353
358
install-swiftpm
359
+ install-libcxx
354
360
355
361
[preset: buildbot_incremental,tools=RA,stdlib=RA,xcode]
356
362
mixin-preset =buildbot_incremental,tools =RA,stdlib =RA
@@ -518,6 +524,7 @@ swift-stdlib-build-type=RelWithDebInfo
518
524
mixin-preset =
519
525
buildbot_incremental_base
520
526
lldb-smoketest,tools =RA
527
+ mixin_buildbot_install_components_with_clang
521
528
build-subdir =buildbot_incremental
522
529
523
530
# We build release+asserts.
@@ -551,6 +558,7 @@ sourcekit-lsp
551
558
install-swift
552
559
install-llbuild
553
560
install-swiftpm
561
+ install-libcxx
554
562
555
563
# We need to build the unittest extras so we can test
556
564
build-swift-stdlib-unittest-extra
@@ -717,8 +725,14 @@ swift-enable-ast-verifier=0
717
725
# ===------------------------------------------------------------------------===#
718
726
# Linux Builders
719
727
# ===------------------------------------------------------------------------===#
728
+ [preset: mixin_linux_install_components_with_clang]
729
+ swift-install-components =autolink-driver; compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-inproc
730
+ llvm-install-components =llvm-cov; llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
731
+
720
732
[preset: mixin_linux_installation]
721
- mixin-preset =mixin_lightweight_assertions
733
+ mixin-preset =
734
+ mixin_lightweight_assertions
735
+ mixin_linux_install_components_with_clang
722
736
723
737
llbuild
724
738
swiftpm
@@ -736,8 +750,6 @@ install-swiftpm
736
750
install-xctest
737
751
install-libicu
738
752
install-prefix =/usr
739
- swift-install-components =autolink-driver; compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-inproc
740
- llvm-install-components =llvm-cov; llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
741
753
install-libcxx
742
754
build-swift-static-stdlib
743
755
build-swift-static-sdk-overlay
@@ -993,7 +1005,9 @@ build-ninja
993
1005
reconfigure
994
1006
995
1007
[preset: buildbot_incremental_linux]
996
- mixin-preset =buildbot_incremental_linux_base
1008
+ mixin-preset =
1009
+ buildbot_incremental_linux_base
1010
+ mixin_linux_install_components_with_clang
997
1011
build-subdir =buildbot_incremental
998
1012
999
1013
libicu
@@ -1013,6 +1027,7 @@ install-swiftpm
1013
1027
install-foundation
1014
1028
install-libdispatch
1015
1029
install-xctest
1030
+ install-libcxx
1016
1031
1017
1032
[preset: buildbot_incremental_linux,long_test]
1018
1033
mixin-preset =buildbot_incremental_linux
@@ -1104,6 +1119,7 @@ sourcekit-lsp=0
1104
1119
# OS X Package Builders
1105
1120
# ===------------------------------------------------------------------------===#
1106
1121
[preset: mixin_osx_package_base]
1122
+ mixin-preset =mixin_buildbot_install_components_with_clang
1107
1123
ios
1108
1124
tvos
1109
1125
watchos
@@ -1143,6 +1159,7 @@ skip-install-swiftsyntax-module
1143
1159
install-skstresstester
1144
1160
install-swiftevolve
1145
1161
install-playgroundsupport
1162
+ install-libcxx
1146
1163
1147
1164
install-destdir =%(install_destdir)s
1148
1165
@@ -1166,10 +1183,6 @@ toolchain-benchmarks
1166
1183
# If someone uses this for incremental builds, force reconfiguration.
1167
1184
reconfigure
1168
1185
1169
- swift-install-components =compiler; clang-resource-dir-symlink;stdlib;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-xpc-service;swift-remote-mirror;swift-remote-mirror-headers
1170
- llvm-install-components =llvm-cov; llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
1171
- install-libcxx
1172
-
1173
1186
# Path to the .tar.gz package we would create.
1174
1187
installable-package =%(installable_package)s
1175
1188
@@ -1345,6 +1358,7 @@ swift-stdlib-build-type=Release
1345
1358
mixin-preset =
1346
1359
buildbot_incremental_base_all_platforms
1347
1360
lldb-smoketest,tools =RA
1361
+ mixin_buildbot_install_components_with_clang
1348
1362
1349
1363
build-subdir =buildbot_incremental
1350
1364
@@ -1363,6 +1377,7 @@ sourcekit-lsp
1363
1377
install-swift
1364
1378
install-llbuild
1365
1379
install-swiftpm
1380
+ install-libcxx
1366
1381
1367
1382
# Build Playground support
1368
1383
playgroundsupport
@@ -1409,7 +1424,9 @@ skip-test-osx
1409
1424
# ===------------------------------------------------------------------------===#
1410
1425
1411
1426
[preset: buildbot_swiftpm_macos_platform,tools=RA,stdlib=RA]
1412
- mixin-preset =buildbot_incremental_base
1427
+ mixin-preset =
1428
+ buildbot_incremental_base
1429
+ mixin_buildbot_install_components_with_clang
1413
1430
1414
1431
build-subdir =buildbot_incremental
1415
1432
@@ -1426,6 +1443,7 @@ sourcekit-lsp
1426
1443
install-swift
1427
1444
install-llbuild
1428
1445
install-swiftpm
1446
+ install-libcxx
1429
1447
1430
1448
dash-dash
1431
1449
@@ -1438,7 +1456,9 @@ skip-test-llbuild
1438
1456
# ===------------------------------------------------------------------------===#
1439
1457
1440
1458
[preset: buildbot_swiftpm_linux_platform,tools=RA,stdlib=RA]
1441
- mixin-preset =buildbot_incremental_base
1459
+ mixin-preset =
1460
+ buildbot_incremental_base
1461
+ mixin_linux_install_components_with_clang
1442
1462
1443
1463
build-subdir =buildbot_incremental
1444
1464
@@ -1460,6 +1480,7 @@ install-swiftpm
1460
1480
install-foundation
1461
1481
install-libdispatch
1462
1482
install-xctest
1483
+ install-libcxx
1463
1484
1464
1485
skip-test-swift
1465
1486
skip-test-cmark
@@ -1510,22 +1531,27 @@ sourcekit-lsp
1510
1531
install-swift
1511
1532
install-llbuild
1512
1533
install-swiftpm
1534
+ install-libcxx
1513
1535
1514
1536
skip-test-swift
1515
1537
skip-test-cmark
1516
1538
skip-test-llbuild
1517
1539
skip-test-swiftpm
1518
1540
1519
1541
[preset: buildbot_swiftpm_package_macos]
1520
- mixin-preset =buildbot_swiftpm_package_base
1542
+ mixin-preset =
1543
+ buildbot_swiftpm_package_base
1544
+ mixin_buildbot_install_components_with_clang
1521
1545
1522
1546
# Build stdlib for all platforms.
1523
1547
ios
1524
1548
tvos
1525
1549
watchos
1526
1550
1527
1551
[preset: buildbot_swiftpm_package_linux]
1528
- mixin-preset =buildbot_swiftpm_package_base
1552
+ mixin-preset =
1553
+ buildbot_swiftpm_package_base
1554
+ mixin_linux_install_components_with_clang
1529
1555
1530
1556
libdispatch
1531
1557
foundation
0 commit comments