Skip to content

Commit 63fdef8

Browse files
authored
Merge pull request #61033 from apple/cherry-pick-no-assertion-linux-preset-main
[main] Add no-assertions preset for Linux
2 parents c47a55d + bba1a00 commit 63fdef8

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
@@ -877,6 +877,17 @@ install-foundation
877877
install-libdispatch
878878
reconfigure
879879

880+
[preset: buildbot_linux]
881+
mixin-preset=
882+
mixin_lightweight_assertions,no-stdlib-asserts
883+
buildbot_linux_base
884+
885+
[preset: buildbot_linux,no_assertions]
886+
mixin-preset=buildbot_linux_base
887+
888+
no-assertions
889+
890+
880891
[preset: mixin_buildbot_linux,no_test]
881892
skip-test-cmark
882893
skip-test-lldb
@@ -899,6 +910,13 @@ mixin-preset=
899910
buildbot_linux
900911
mixin_buildbot_linux,no_test
901912

913+
914+
[preset: buildbot_linux,no_assertions,no_test]
915+
mixin-preset=
916+
buildbot_linux,no_assertions
917+
mixin_buildbot_linux,no_test
918+
919+
902920
[preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build]
903921
mixin-preset=
904922
mixin_lightweight_assertions,no-stdlib-asserts
@@ -989,7 +1007,9 @@ mixin-preset=
9891007
mixin_buildbot_linux,no_test
9901008

9911009
[preset: buildbot_linux,smoketest]
992-
mixin-preset=mixin_linux_installation
1010+
mixin-preset=
1011+
mixin_lightweight_assertions,no-stdlib-asserts
1012+
mixin_linux_installation
9931013
build-subdir=buildbot_linux
9941014
lldb
9951015
release

0 commit comments

Comments
 (0)