Skip to content

Commit

Permalink
libc: make all builds LLVM_ENABLE_RUNTIMES
Browse files Browse the repository at this point in the history
No longer will any CI builds use LLVM_ENABLE_PROJECTS, which is deprecated as
of llvm/llvm-project#117265.

libc-x86_64-debian-dbg-runtimes-build can be offlined as a result of this
change.

Buildbots will probably need their CMakeCache.txt reset after this.
  • Loading branch information
nickdesaulniers committed Dec 10, 2024
1 parent 95b6239 commit c0ace11
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions zorg/buildbot/builders/annotated/libc-linux.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
def is_fullbuild_builder(builder_name):
return ('fullbuild' in builder_name.split('-'))

def is_runtimes_builder(builder_name):
return ('runtimes' in builder_name.split('-'))

def is_bootstrap_builder(builder_name):
return 'bootstrap' in builder_name

Expand Down Expand Up @@ -44,7 +41,6 @@ def main(argv):
source_dir = os.path.join('..', 'llvm-project')
builder_name = os.environ.get('BUILDBOT_BUILDERNAME')
fullbuild = is_fullbuild_builder(builder_name)
runtimes_build = is_runtimes_builder(builder_name)
bootstrap_build = is_bootstrap_builder(builder_name)
gcc_build = is_gcc_builder(builder_name)
lint_build = is_lint_builder(builder_name)
Expand All @@ -71,16 +67,14 @@ def main(argv):
# explicit here, which reduces one step of setting environment
# variables when setting up workers.
cmake_args = ['-GNinja',
'-DLLVM_ENABLE_RUNTIMES=libc',
'-DCMAKE_C_COMPILER=%s' % cc,
'-DCMAKE_CXX_COMPILER=%s' % cxx]
if lint_build:
cmake_args.append('-DLLVM_LIBC_CLANG_TIDY=%s' % clang_tidy)

if runtimes_build or bootstrap_build:
if bootstrap_build:
projects = ['clang']
cmake_args.append('-DLLVM_ENABLE_RUNTIMES=libc')
else:
projects = ['libc']

if args.debug:
cmake_args.append('-DCMAKE_BUILD_TYPE=Debug')
Expand Down Expand Up @@ -131,7 +125,7 @@ def main(argv):
with step('build libc-startup'):
run_command(['ninja', 'libc-startup'])

if runtimes_build or bootstrap_build:
if bootstrap_build:
with step('check-libc'):
run_command(['ninja', 'check-libc'])
else:
Expand All @@ -150,7 +144,7 @@ def main(argv):
with step('Benchmark Utils Tests'):
run_command(['ninja', 'libc-benchmark-util-tests'])

if not (fullbuild or runtimes_build or bootstrap_build) and x86_64_build:
if not (fullbuild or bootstrap_build) and x86_64_build:
with step('libc-fuzzer'):
run_command(['ninja', 'libc-fuzzer'])

Expand Down

0 comments on commit c0ace11

Please sign in to comment.