Skip to content

llvm-cmake-sanitized should bootstrap clang + compiler-rt on macOS #707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ndrewh merged 1 commit into from
Jan 15, 2026
Merged

llvm-cmake-sanitized should bootstrap clang + compiler-rt on macOS #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 29 additions & 9 deletions zorg/jenkins/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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(),
Expand All @@ -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':
Expand All @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion zorg/jenkins/jobs/jobs/lldb-cmake-sanitized
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
'''
Expand Down