Skip to content

Commit d168fc9

Browse files
committed
Bootstrap: Add stage-1 preset
Adding a stage-1 buildbot preset and updating the stage 0 preset to install the stage0 bootstrap somewhere so that it can be used to bootstrap the stage-1 toolchain.
1 parent 82bccb5 commit d168fc9

File tree

1 file changed

+55
-11
lines changed

1 file changed

+55
-11
lines changed

utils/build-presets.ini

Lines changed: 55 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3117,15 +3117,9 @@ llvm-cmake-options=
31173117
# Build Requirements:
31183118
# - C and C++ compiler
31193119
# Toolchain Outputs:
3120-
# - Swift Compiler
3121-
# C++ Driver
3122-
# No Macro Support
3123-
# No Swift Compiler Sources
3120+
# - Swift Compiler (-SwiftDriver, -macros, -SwiftSilOpts)
31243121
# Runtime Outputs:
3125-
# - Swift Standard Library
3126-
# swiftCore
3127-
# OnoneSupport
3128-
# Concurrency
3122+
# - Swift Standard Library (-macros)
31293123
[preset: bootstrap_stage0]
31303124
mixin-preset=
31313125
mixin_buildbot_linux,no_test
@@ -3138,17 +3132,67 @@ release
31383132
skip-early-swiftsyntax
31393133
skip-early-swift-driver
31403134
skip-build-benchmarks
3135+
build-swift-examples=0
31413136

31423137
build-runtime-with-host-compiler=0
31433138
build-swift-libexec=0
31443139
build-swift-remote-mirror=0
31453140

3146-
swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;toolchain-tools
3147-
llvm-install-components=llvm-ar;llvm-ranlib;clang;clang-resource-headers;compiler-rt;clang-features-file;llvm-symbolizer
3148-
31493141
extra-cmake-options=
31503142
-DLLVM_TARGETS_TO_BUILD=AArch64;X86
31513143

31523144
swift-cmake-options=
3145+
-DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY:BOOL=YES
3146+
-DSWIFT_ENABLE_EXPERIMENTAL_OBSERVATION:BOOL=NO
3147+
-DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED:BOOL=NO
3148+
-DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING:BOOL=NO
31533149
-DSWIFT_ENABLE_SWIFT_IN_SWIFT:BOOL=NO
31543150
-DSWIFT_INCLUDE_DOCS:BOOL=NO
3151+
-DSWIFT_BUILD_EXAMPLES:BOOL=OFF
3152+
-DSWIFT_BUILD_STATIC_SDK_OVERLAY:BOOL=NO
3153+
-DSWIFT_BUILD_STATIC_STDLIB:BOOL=NO
3154+
3155+
build-subdir=%(build_subdir)s
3156+
install-destdir=%(install_destdir)s
3157+
3158+
swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;toolchain-tools
3159+
llvm-install-components=llvm-ar;llvm-ranlib;clang;clang-resource-headers;compiler-rt;clang-features-file;llvm-symbolizer
3160+
3161+
install-llvm
3162+
install-swift
3163+
3164+
# Build Toolchain Requirements:
3165+
# - C/C++ compiler
3166+
# - Swift Compiler (-SwiftDriver, -macros, -SwiftSilOpts)
3167+
# Toolchain Outputs:
3168+
# - Swift Compiler (-SwiftDriver, +macros, +SwiftSilOpts)
3169+
# Runtime Outputs:
3170+
# - Standard Library (+macros)
3171+
# - Dispatch
3172+
# - Foundation (+macros)
3173+
[preset: bootstrap_stage1]
3174+
mixin-preset=mixin_buildbot_linux,no_test
3175+
bootstrapping=hosttools
3176+
3177+
release
3178+
foundation
3179+
libdispatch
3180+
3181+
skip-early-swift-driver
3182+
skip-build-benchmarks
3183+
3184+
enable-experimental-concurrency=1
3185+
3186+
extra-cmake-options=
3187+
-DLLVM_TARGETS_TO_BUILD=AArch64;X86
3188+
3189+
swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;toolchain-tools;license
3190+
llvm-install-components=llvm-ar;llvm-ranlib;clang;clang-resource-headers;compiler-rt;clang-features-file;lld
3191+
3192+
build-subdir=%(build_subdir)s
3193+
install-destdir=%(install_destdir)s
3194+
3195+
install-llvm
3196+
install-swift
3197+
install-foundation
3198+
install-libdispatch

0 commit comments

Comments
 (0)