Skip to content

Commit 116a5b0

Browse files
committed
build: enable libswift bootstrapping by default
But use the "hosttools" mode for build presets, which compile tools in "Debug" configuration (to reduce build time).
1 parent dd984b1 commit 116a5b0

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

utils/build-presets.ini

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,6 @@ install-swiftpm
372372
install-swift-driver
373373
install-libcxx
374374

375-
libswift=bootstrapping
376-
377375
[preset: buildbot_incremental,tools=RA,stdlib=RA,apple_silicon]
378376
mixin-preset=buildbot_incremental,tools=RA,stdlib=RA
379377

@@ -578,6 +576,9 @@ enable-asan
578576

579577
swift-stdlib-build-type=RelWithDebInfo
580578

579+
# Don't do bootstrapping to speed up the build
580+
libswift=hosttools
581+
581582

582583
[preset: buildbot_incremental,tools=RA,stdlib=RD,smoketest=macosx]
583584
mixin-preset=
@@ -650,8 +651,8 @@ skip-build-benchmarks
650651
# Skip playground tests
651652
skip-test-playgroundsupport
652653

653-
# Enable libswift
654-
libswift
654+
# Don't do bootstrapping to speed up the build
655+
libswift=hosttools
655656

656657
[preset: buildbot_incremental,tools=RA,stdlib=RD,smoketest=macosx,flto]
657658
mixin-preset=buildbot_incremental,tools=RA,stdlib=RD,smoketest=macosx
@@ -1404,6 +1405,10 @@ debug-llvm
14041405
debug-swift
14051406
no-swift-stdlib-assertions
14061407

1408+
# Don't do bootstrapping to speed up the build
1409+
libswift=hosttools
1410+
1411+
14071412
[preset: buildbot_osx_package,tools=DA,stdlib=R,use_os_runtime]
14081413
mixin-preset=
14091414
buildbot_osx_package,tools=DA,stdlib=R
@@ -1555,8 +1560,8 @@ build-swift-stdlib-unittest-extra
15551560

15561561
libcxx
15571562

1558-
# Enable libswift
1559-
libswift
1563+
# Don't do bootstrapping to speed up the build
1564+
libswift=hosttools
15601565

15611566
# Build llbuild & swiftpm here
15621567
llbuild
@@ -2273,6 +2278,10 @@ assertions
22732278
debug-llvm
22742279
debug-swift
22752280

2281+
# Don't do bootstrapping to speed up the build
2282+
libswift=hosttools
2283+
2284+
22762285
#===------------------------------------------------------------------------===#
22772286
# Swift Preset
22782287
# Tools: DebInfo and Assertions
@@ -2290,6 +2299,10 @@ debug-swift
22902299
swift-stdlib-build-type=RelWithDebInfo
22912300
swift-stdlib-enable-assertions=true
22922301

2302+
# Don't do bootstrapping to speed up the build
2303+
libswift=hosttools
2304+
2305+
22932306
#===------------------------------------------------------------------------===#
22942307
# Swift Coverage Preset
22952308
#===------------------------------------------------------------------------===#

utils/build-script-impl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,11 +358,11 @@ function true_false() {
358358

359359
function to_libswift_buildmode() {
360360
case "$1" in
361-
false | FALSE | 0 | "")
361+
false | FALSE | 0)
362362
echo "OFF"
363363
;;
364-
true | TRUE | 1)
365-
echo "HOSTTOOLS"
364+
true | TRUE | 1 | "")
365+
echo "BOOTSTRAPPING"
366366
;;
367367
*)
368368
echo `toupper $1`

0 commit comments

Comments
 (0)