From 78379bd0a382894d967d058290e81eb2564e49c9 Mon Sep 17 00:00:00 2001
From: Andrew Haberlandt <ahaberlandt@apple.com>
Date: Thu, 15 Jan 2026 08:56:45 -0800
Subject: [PATCH] llvm-cmake-sanitized should bootstrap clang + compiler-rt on
 macOS

This is to work around an issue where sanitized libLTO cannot be
loaded into LD.

We probably should have been bootstrapping anyway to test with
latest sanitizer runtimes.

rdar://164487647
---
 zorg/jenkins/build.py                       | 38 ++++++++++++++++-----
 zorg/jenkins/jobs/jobs/lldb-cmake-sanitized |  2 +-
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/zorg/jenkins/build.py b/zorg/jenkins/build.py
index 3da640454..224d2c106 100644
--- a/zorg/jenkins/build.py
+++ b/zorg/jenkins/build.py
@@ -551,7 +551,7 @@ def lldb_cmake_builder(target, variant=None):
                  '-DCMAKE_INSTALL_PREFIX={}'.format(conf.lldbinstalldir()),
                  '-DCMAKE_MAKE_PROGRAM={}'.format(NINJA),
                  '-DLLDB_TEST_USER_ARGS='+';'.join(dotest_args),
-                 '-DLLDB_ENFORCE_STRICT_TEST_REQUIREMENTS=Off', # Using system clang.
+                 '-DLLDB_ENFORCE_STRICT_TEST_REQUIREMENTS=On',
                  '-DLLDB_ENABLE_PYTHON=On',
                  '-DLLDB_ENABLE_LZMA=Off',
                  '-DLIBCXX_HARDENING_MODE=none',
@@ -589,6 +589,25 @@ def lldb_cmake_builder(target, variant=None):
 
     cmake_cmd.extend(conf.cmake_flags)
 
+    if variant == "sanitized":
+        # On macOS, we need to use bootstrapped sanitizer runtimes for sanitized libLTO
+        # to be loadable in ld
+        def bootstrap_option(x):
+            if x.startswith("-D"):
+                return "-DBOOTSTRAP_" + x[2:]
+            return x
+
+        cmake_cmd = [bootstrap_option(x) for x in cmake_cmd]
+        cmake_cmd.extend(
+            [
+                "-DCMAKE_MAKE_PROGRAM={}".format(NINJA),
+                "-DCLANG_ENABLE_BOOTSTRAP=ON",
+                "-DLLVM_ENABLE_PROJECTS=clang",
+                "-DLLVM_ENABLE_RUNTIMES=compiler-rt",
+                "-DCMAKE_BUILD_TYPE=Release",
+            ]
+        )
+
     if conf.CC():
         cmake_cmd.extend([
             '-DCMAKE_C_COMPILER=' + conf.CC(),
@@ -599,14 +618,14 @@ def lldb_cmake_builder(target, variant=None):
     delete_module_caches(conf.workspace)
     footer()
 
-    if target == 'all' or target == 'configure' or target == 'build':
+    if target == "all" or target == "configure" or target == "build":
         header("Cmake")
         run_cmd(conf.lldbbuilddir(), cmake_cmd)
         footer()
 
     if target == 'all' or target == 'build':
         header("Build")
-        run_cmd(conf.lldbbuilddir(), [NINJA, '-v'])
+        run_cmd(conf.lldbbuilddir(), [NINJA, '-v'] + (["stage2"] if variant == 'sanitized' else []))
         footer()
 
     if target == 'all' or target == 'install':
@@ -616,12 +635,13 @@ def lldb_cmake_builder(target, variant=None):
 
     if target == 'all' or target == 'test' or target == 'testlong':
         header("Run Tests")
-        if variant == 'debuginfo':
-            test_command = ['/usr/bin/env', 'TERM=vt100', NINJA,
-                            '-v', 'check-debuginfo']
-        else:
-            test_command = ['/usr/bin/env', 'TERM=vt100', NINJA,
-                            '-v', 'check-lldb']
+        check_target = "check-lldb"
+        if variant == "debuginfo":
+            check_target = "check-debuginfo"
+        elif variant == "sanitized":
+            check_target = "stage2-check-lldb"
+
+        test_command = ["/usr/bin/env", "TERM=vt100", NINJA, "-v", check_target]
         run_cmd(conf.lldbbuilddir(), test_command)
         footer()
 
diff --git a/zorg/jenkins/jobs/jobs/lldb-cmake-sanitized b/zorg/jenkins/jobs/jobs/lldb-cmake-sanitized
index 6ef6fe11c..0d8f33b91 100644
--- a/zorg/jenkins/jobs/jobs/lldb-cmake-sanitized
+++ b/zorg/jenkins/jobs/jobs/lldb-cmake-sanitized
@@ -108,7 +108,7 @@ pipeline {
                     python3 llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-sanitized build \
                       --assertions \
                       --projects="clang;lld;lldb"  \
-                      --runtimes="" \
+                      --runtimes="libcxx;libcxxabi;libunwind" \
                       --cmake-type=Release \
                       --cmake-flag="-DPython3_EXECUTABLE=$(which python)"
                     '''