Skip to content

Commit b3c92a0

Browse files
committed
Add System to the toolchain
1 parent b916be3 commit b3c92a0

File tree

13 files changed

+307
-3
lines changed

13 files changed

+307
-3
lines changed

utils/build-presets.ini

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@ build-swift-stdlib-unittest-extra
435435
skip-test-swift
436436
skip-test-libdispatch
437437
skip-test-foundation
438+
skip-test-system
438439

439440
# This preset may be used by swift-corelibs-xctest contributors when building
440441
# locally. It takes less time than the CI preset, but is less reliable at
@@ -450,6 +451,7 @@ test
450451
skip-test-cmark
451452
skip-test-swift
452453
skip-test-foundation
454+
skip-test-system
453455
skip-build-benchmarks
454456

455457
[preset: buildbot_incremental_asan,tools=RDA,stdlib=RDA]
@@ -917,17 +919,20 @@ validation-test
917919
long-test
918920
stress-test
919921
test-optimized
922+
system
920923
foundation
921924
libdispatch
922925
indexstore-db
923926
sourcekit-lsp
924927
swiftdocc
925928
lit-args=-v --time-tests
926929
foundation-tests-build-type=Debug
930+
system-tests-build-type=Debug
927931

928932
# rdar://problem/31454823
929933
lldb-test-swift-only
930934

935+
install-system
931936
install-foundation
932937
install-libdispatch
933938
install-swiftformat
@@ -950,6 +955,7 @@ skip-test-swiftdocc
950955
mixin-preset=buildbot_linux
951956

952957
foundation-tests-build-type=Release
958+
system-tests-build-type=Release
953959

954960
[preset: buildbot_linux_crosscompile_wasm]
955961
mixin-preset=buildbot_linux
@@ -984,6 +990,7 @@ skip-test-swiftpm
984990
skip-test-swift-driver
985991
skip-test-xctest
986992
skip-test-foundation
993+
skip-test-system
987994
skip-test-libdispatch
988995
skip-test-playgroundsupport
989996
skip-test-indexstore-db
@@ -1107,11 +1114,13 @@ release
11071114
test
11081115
validation-test
11091116
foundation
1117+
system
11101118
libdispatch
11111119
indexstore-db
11121120
sourcekit-lsp
11131121
lit-args=-v
11141122

1123+
install-system
11151124
install-foundation
11161125
install-libdispatch
11171126
install-swiftformat
@@ -1120,6 +1129,7 @@ test-optimized
11201129
skip-test-swiftdocc
11211130
lldb-test-swift-only
11221131
foundation-tests-build-type=Debug
1132+
system-tests-build-type=Debug
11231133

11241134
# gcc version on amazon linux 2 is too old to configure and build tablegen.
11251135
# Use the clang that we install in the path for macros
@@ -1135,6 +1145,7 @@ test
11351145
validation-test
11361146
long-test
11371147
stress-test
1148+
system
11381149
foundation
11391150
lit-args=-v
11401151
indexstore-db=0
@@ -1146,6 +1157,7 @@ llbuild
11461157
lldb
11471158
# Not all tests pass, currently
11481159
#test
1160+
system
11491161
foundation
11501162
swiftpm
11511163
swift-driver
@@ -1160,6 +1172,7 @@ install-static-linux-config
11601172
install-swift
11611173
install-lldb
11621174
install-llbuild
1175+
install-system
11631176
install-foundation
11641177
install-swiftpm
11651178
install-swift-driver
@@ -1226,12 +1239,14 @@ swift-driver
12261239
xctest
12271240
swift-testing
12281241
swift-testing-macros
1242+
system
12291243
foundation
12301244
libdispatch
12311245
swiftsyntax
12321246
swiftformat
12331247
indexstore-db
12341248
sourcekit-lsp
1249+
system-tests-build-type=Debug
12351250
foundation-tests-build-type=Debug
12361251

12371252
install-llvm
@@ -1241,6 +1256,7 @@ install-llbuild
12411256
install-swiftpm
12421257
install-swift-driver
12431258
install-swiftsyntax
1259+
install-system
12441260
install-foundation
12451261
install-libdispatch
12461262
install-xctest
@@ -1357,6 +1373,7 @@ llvm-targets-to-build=X86;ARM;AArch64;WebAssembly
13571373
#===------------------------------------------------------------------------===#
13581374
[preset: mixin_freebsd_package_products]
13591375

1376+
system
13601377
foundation
13611378
indexstore-db
13621379
libdispatch
@@ -1374,6 +1391,7 @@ xctest
13741391
swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;libexec;stdlib;swift-remote-mirror;sdk-overlay;static-mirror-lib;toolchain-tools;license;sourcekit-inproc
13751392
llvm-install-components=llvm-ar;llvm-ranlib;llvm-cov;llvm-profdata;llvm-objdump;llvm-objcopy;llvm-symbolizer;IndexStore;clang;clang-resource-headers;builtins;runtimes;clangd;libclang;lld;LTO;clang-features-file
13761393

1394+
install-system
13771395
install-foundation
13781396
install-libdispatch
13791397
install-llbuild
@@ -1923,6 +1941,7 @@ skip-test-osx
19231941

19241942
llvm-cmake-options=-DCLANG_DEFAULT_LINKER=gold
19251943

1944+
system
19261945
foundation
19271946
libdispatch
19281947
test
@@ -1934,6 +1953,7 @@ lldb-test-swift-only
19341953

19351954
skip-test-cmark
19361955
skip-test-swift
1956+
skip-test-system
19371957
skip-test-foundation
19381958

19391959
#===------------------------------------------------------------------------===#
@@ -1974,14 +1994,17 @@ infer-cross-compile-hosts-on-darwin
19741994
mixin-preset=mixin_swiftpm_base
19751995

19761996
libdispatch
1997+
system
19771998
foundation
19781999
xctest
19792000
libcxx=false
19802001

2002+
install-system
19812003
install-foundation
19822004
install-libdispatch
19832005
install-xctest
19842006

2007+
skip-test-system
19852008
skip-test-foundation
19862009
skip-test-libdispatch
19872010
skip-test-xctest
@@ -2009,14 +2032,17 @@ skip-test-swiftpm
20092032
mixin-preset=mixin_swiftpm_base
20102033

20112034
libdispatch
2035+
system
20122036
foundation
20132037
xctest
20142038
libcxx=false
20152039

2040+
install-system
20162041
install-foundation
20172042
install-libdispatch
20182043
install-xctest
20192044

2045+
skip-test-system
20202046
skip-test-foundation
20212047
skip-test-libdispatch
20222048
skip-test-xctest
@@ -2265,6 +2291,7 @@ swiftpm
22652291
xctest
22662292
swift-testing
22672293
swift-testing-macros
2294+
system
22682295
foundation
22692296
libdispatch
22702297
indexstore-db
@@ -2275,6 +2302,7 @@ release
22752302
validation-test
22762303
reconfigure
22772304

2305+
install-system
22782306
install-foundation
22792307
install-libdispatch
22802308
install-libcxx
@@ -2293,6 +2321,7 @@ install-swiftformat
22932321
skip-test-cmark
22942322
skip-test-swift
22952323
skip-test-libdispatch
2324+
skip-test-system
22962325
skip-test-foundation
22972326

22982327
llvm-cmake-options=
@@ -3123,11 +3152,13 @@ install-symroot=%(install_symroot)s
31233152
[preset: source_compat_suite_linux_base]
31243153
mixin-preset=source_compat_suite_base
31253154
build-subdir=compat_linux
3155+
system
31263156
foundation
31273157
libdispatch
31283158
xctest
31293159
swift-testing
31303160
swift-testing-macros
3161+
install-system
31313162
install-foundation
31323163
install-libdispatch
31333164
install-swift-testing
@@ -3209,6 +3240,7 @@ mixin-preset=
32093240

32103241
[preset: linux_lldb]
32113242
lldb
3243+
system
32123244
foundation
32133245
libdispatch
32143246
build-ninja
@@ -3221,6 +3253,7 @@ test
32213253
skip-test-cmark
32223254
skip-test-swift
32233255
skip-build-benchmarks
3256+
skip-test-system
32243257
skip-test-foundation
32253258

32263259
llvm-cmake-options=
@@ -3292,6 +3325,7 @@ mixin-preset=mixin_buildbot_linux,no_test
32923325
bootstrapping=hosttools
32933326

32943327
release
3328+
system
32953329
foundation
32963330
libdispatch
32973331

@@ -3311,6 +3345,7 @@ install-destdir=%(install_destdir)s
33113345

33123346
install-llvm
33133347
install-swift
3348+
install-system
33143349
install-foundation
33153350
install-libdispatch
33163351

@@ -3332,6 +3367,7 @@ swift-include-tests=0
33323367
llvm-include-tests=0
33333368

33343369

3370+
system
33353371
foundation
33363372
libdispatch
33373373

@@ -3346,6 +3382,7 @@ llvm-install-components=llvm-ar;llvm-ranlib;clang;clang-resource-headers;builtin
33463382

33473383
install-llvm
33483384
install-swift
3385+
install-system
33493386
install-foundation
33503387
install-libdispatch
33513388
install-llbuild
@@ -3431,6 +3468,7 @@ skip-test-llbuild
34313468
skip-test-swiftpm
34323469
skip-test-swift-driver
34333470
skip-test-xctest
3471+
skip-test-system
34343472
skip-test-foundation
34353473
skip-test-libdispatch
34363474
skip-test-playgroundsupport

utils/build-script

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,11 +329,12 @@ def apply_default_arguments(toolchain, args):
329329
platform.system() != "Darwin"):
330330
args.build_foundation = True
331331

332-
# Foundation has a dependency on libdispatch.
332+
# Foundation has a dependency on libdispatch and System.
333333
# On OS X, libdispatch is provided by the OS.
334334
# On Linux, we must ensure that it is built manually.
335335
if (args.build_foundation and
336336
platform.system() != "Darwin"):
337+
args.build_system = True
337338
args.build_libdispatch = True
338339

339340
if args.build_subdir is None:

0 commit comments

Comments
 (0)