Skip to content

Commit a1df381

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. (cherry picked from commit d168fc9)
1 parent 7f0d24b commit a1df381

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
@@ -3116,15 +3116,9 @@ llvm-cmake-options=
31163116
# Build Requirements:
31173117
# - C and C++ compiler
31183118
# Toolchain Outputs:
3119-
# - Swift Compiler
3120-
# C++ Driver
3121-
# No Macro Support
3122-
# No Swift Compiler Sources
3119+
# - Swift Compiler (-SwiftDriver, -macros, -SwiftSilOpts)
31233120
# Runtime Outputs:
3124-
# - Swift Standard Library
3125-
# swiftCore
3126-
# OnoneSupport
3127-
# Concurrency
3121+
# - Swift Standard Library (-macros)
31283122
[preset: bootstrap_stage0]
31293123
mixin-preset=
31303124
mixin_buildbot_linux,no_test
@@ -3137,17 +3131,67 @@ release
31373131
skip-early-swiftsyntax
31383132
skip-early-swift-driver
31393133
skip-build-benchmarks
3134+
build-swift-examples=0
31403135

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

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

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

0 commit comments

Comments
 (0)