diff --git a/utils/build-presets.ini b/utils/build-presets.ini index 84b0baaa41d8e..a235a167b5838 100644 --- a/utils/build-presets.ini +++ b/utils/build-presets.ini @@ -812,7 +812,6 @@ llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-h [preset: mixin_linux_installation] mixin-preset= - mixin_lightweight_assertions,no-stdlib-asserts mixin_linux_install_components_with_clang llbuild @@ -859,8 +858,9 @@ installable-package=%(installable_package)s relocate-xdg-cache-home-under-build-subdir -[preset: buildbot_linux] -mixin-preset=mixin_linux_installation +[preset: buildbot_linux_base] +mixin-preset= + mixin_linux_installation build-subdir=buildbot_linux lldb release @@ -885,6 +885,17 @@ install-foundation install-libdispatch reconfigure +[preset: buildbot_linux] +mixin-preset= + mixin_lightweight_assertions,no-stdlib-asserts + buildbot_linux_base + +[preset: buildbot_linux,no_assertions] +mixin-preset=buildbot_linux_base + +no-assertions + + [preset: mixin_buildbot_linux,no_test] skip-test-cmark skip-test-lldb @@ -907,6 +918,13 @@ mixin-preset= buildbot_linux mixin_buildbot_linux,no_test + +[preset: buildbot_linux,no_assertions,no_test] +mixin-preset= + buildbot_linux,no_assertions + mixin_buildbot_linux,no_test + + [preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build] mixin-preset= mixin_lightweight_assertions,no-stdlib-asserts @@ -997,7 +1015,9 @@ mixin-preset= mixin_buildbot_linux,no_test [preset: buildbot_linux,smoketest] -mixin-preset=mixin_linux_installation +mixin-preset= + mixin_lightweight_assertions,no-stdlib-asserts + mixin_linux_installation build-subdir=buildbot_linux lldb release