Skip to content

Commit e215122

Browse files
authored
Merge pull request #61034 from apple/cherry-pick-no-assertion-linux-preset
[5.7] Add no-assertions preset for Linux
2 parents 018e26e + 2082f3d commit e215122

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
@@ -806,7 +806,6 @@ llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-h
806806

807807
[preset: mixin_linux_installation]
808808
mixin-preset=
809-
mixin_lightweight_assertions,no-stdlib-asserts
810809
mixin_linux_install_components_with_clang
811810

812811
llbuild
@@ -853,8 +852,9 @@ installable-package=%(installable_package)s
853852
relocate-xdg-cache-home-under-build-subdir
854853

855854

856-
[preset: buildbot_linux]
857-
mixin-preset=mixin_linux_installation
855+
[preset: buildbot_linux_base]
856+
mixin-preset=
857+
mixin_linux_installation
858858
build-subdir=buildbot_linux
859859
lldb
860860
release
@@ -879,6 +879,17 @@ install-foundation
879879
install-libdispatch
880880
reconfigure
881881

882+
[preset: buildbot_linux]
883+
mixin-preset=
884+
mixin_lightweight_assertions,no-stdlib-asserts
885+
buildbot_linux_base
886+
887+
[preset: buildbot_linux,no_assertions]
888+
mixin-preset=buildbot_linux_base
889+
890+
no-assertions
891+
892+
882893
[preset: mixin_buildbot_linux,no_test]
883894
skip-test-cmark
884895
skip-test-lldb
@@ -901,6 +912,13 @@ mixin-preset=
901912
buildbot_linux
902913
mixin_buildbot_linux,no_test
903914

915+
916+
[preset: buildbot_linux,no_assertions,no_test]
917+
mixin-preset=
918+
buildbot_linux,no_assertions
919+
mixin_buildbot_linux,no_test
920+
921+
904922
[preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build]
905923
mixin-preset=
906924
mixin_lightweight_assertions,no-stdlib-asserts
@@ -991,7 +1009,9 @@ mixin-preset=
9911009
mixin_buildbot_linux,no_test
9921010

9931011
[preset: buildbot_linux,smoketest]
994-
mixin-preset=mixin_linux_installation
1012+
mixin-preset=
1013+
mixin_lightweight_assertions,no-stdlib-asserts
1014+
mixin_linux_installation
9951015
build-subdir=buildbot_linux
9961016
lldb
9971017
release

0 commit comments

Comments
 (0)