Skip to content

Commit d2a90f5

Browse files
authored
Merge pull request #61032 from apple/cherry-pick-no-assertion-linux-preset-5.7.0
[5.7.0] Add no-assertions preset for Linux
2 parents 3e7aec8 + c07843a commit d2a90f5

File tree

1 file changed

+24
-4
lines changed

1 file changed

+24
-4
lines changed

utils/build-presets.ini

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,6 @@ llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-h
812812

813813
[preset: mixin_linux_installation]
814814
mixin-preset=
815-
mixin_lightweight_assertions,no-stdlib-asserts
816815
mixin_linux_install_components_with_clang
817816

818817
llbuild
@@ -859,8 +858,9 @@ installable-package=%(installable_package)s
859858
relocate-xdg-cache-home-under-build-subdir
860859

861860

862-
[preset: buildbot_linux]
863-
mixin-preset=mixin_linux_installation
861+
[preset: buildbot_linux_base]
862+
mixin-preset=
863+
mixin_linux_installation
864864
build-subdir=buildbot_linux
865865
lldb
866866
release
@@ -885,6 +885,17 @@ install-foundation
885885
install-libdispatch
886886
reconfigure
887887

888+
[preset: buildbot_linux]
889+
mixin-preset=
890+
mixin_lightweight_assertions,no-stdlib-asserts
891+
buildbot_linux_base
892+
893+
[preset: buildbot_linux,no_assertions]
894+
mixin-preset=buildbot_linux_base
895+
896+
no-assertions
897+
898+
888899
[preset: mixin_buildbot_linux,no_test]
889900
skip-test-cmark
890901
skip-test-lldb
@@ -907,6 +918,13 @@ mixin-preset=
907918
buildbot_linux
908919
mixin_buildbot_linux,no_test
909920

921+
922+
[preset: buildbot_linux,no_assertions,no_test]
923+
mixin-preset=
924+
buildbot_linux,no_assertions
925+
mixin_buildbot_linux,no_test
926+
927+
910928
[preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build]
911929
mixin-preset=
912930
mixin_lightweight_assertions,no-stdlib-asserts
@@ -997,7 +1015,9 @@ mixin-preset=
9971015
mixin_buildbot_linux,no_test
9981016

9991017
[preset: buildbot_linux,smoketest]
1000-
mixin-preset=mixin_linux_installation
1018+
mixin-preset=
1019+
mixin_lightweight_assertions,no-stdlib-asserts
1020+
mixin_linux_installation
10011021
build-subdir=buildbot_linux
10021022
lldb
10031023
release

0 commit comments

Comments
 (0)