From 117647aa1b0913ef4c38d05355bfb73532434dd8 Mon Sep 17 00:00:00 2001
From: Mishal Shah <mishal_shah@apple.com>
Date: Tue, 8 Mar 2022 15:44:18 -0800
Subject: [PATCH 1/2] Add preset with no_assertions and no_test for Linux

(cherry picked from commit a7cc57a7c6b1f3b67f66eb81d0eb4d000a93ec69)
---
 utils/build-presets.ini | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index 84b0baaa41d8e..c43cf14b53ac0 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
@@ -907,6 +907,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

From c07843a12a38a8628088dd13764f456a249b793a Mon Sep 17 00:00:00 2001
From: Mishal Shah <mishal_shah@apple.com>
Date: Thu, 3 Mar 2022 23:25:54 -0800
Subject: [PATCH 2/2] Add no-assertions preset for Linux

(cherry picked from commit 581a49f37e7aa5ba4138b675ac25d1130f1f67c7)
---
 utils/build-presets.ini | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index c43cf14b53ac0..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
@@ -1004,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