Skip to content

Commit f8f2e56

Browse files
authored
[build-presets] Enable stdlib assertions on Linux installations (swiftlang#32511)
Enable stdlib assertions in mixin_linux_installation. Other presets which use mixin_lightweight_assertions, such as buildbot_linux_crosscompile_android and buildbot_osx_package, are not affected by this change. Stdlib assertions are needed by reflection validation tests on Linux.
1 parent d96d2db commit f8f2e56

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

utils/build-presets.ini

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,6 @@ assertions
760760
# compiler significantly.
761761
[preset: mixin_lightweight_assertions]
762762
assertions
763-
no-swift-stdlib-assertions
764763

765764
# FIXME: This should be:
766765
# no-assertions
@@ -772,6 +771,12 @@ dash-dash
772771
# AST verifier slows down the compiler significantly.
773772
swift-enable-ast-verifier=0
774773

774+
[preset: mixin_lightweight_assertions,no-stdlib-asserts]
775+
mixin-preset=
776+
mixin_lightweight_assertions
777+
778+
no-swift-stdlib-assertions
779+
775780
#===------------------------------------------------------------------------===#
776781
# Linux Builders
777782
#===------------------------------------------------------------------------===#
@@ -870,7 +875,7 @@ mixin-preset=
870875

871876
[preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build]
872877
mixin-preset=
873-
mixin_lightweight_assertions
878+
mixin_lightweight_assertions,no-stdlib-asserts
874879
mixin_linux_install_components_with_clang
875880
build-subdir=buildbot_linux
876881

@@ -1287,7 +1292,7 @@ installable-package=%(installable_package)s
12871292
mixin-preset=
12881293
mixin_osx_package_base
12891294
mixin_osx_package_test
1290-
mixin_lightweight_assertions
1295+
mixin_lightweight_assertions,no-stdlib-asserts
12911296

12921297

12931298
[preset: buildbot_osx_package,no_assertions]

0 commit comments

Comments
 (0)