1212def is_fullbuild_builder (builder_name ):
1313 return ('fullbuild' in builder_name .split ('-' ))
1414
15- def is_runtimes_builder (builder_name ):
16- return ('runtimes' in builder_name .split ('-' ))
17-
1815def is_gcc_builder (builder_name ):
1916 return ('gcc' in builder_name .split ('-' ))
2017
@@ -41,7 +38,6 @@ def main(argv):
4138 source_dir = os .path .join ('..' , 'llvm-project' )
4239 builder_name = os .environ .get ('BUILDBOT_BUILDERNAME' )
4340 fullbuild = is_fullbuild_builder (builder_name )
44- runtimes_build = is_runtimes_builder (builder_name )
4541 gcc_build = is_gcc_builder (builder_name )
4642 lint_build = is_lint_builder (builder_name )
4743 riscv_build = is_riscv_builder (builder_name )
@@ -72,11 +68,10 @@ def main(argv):
7268 if lint_build :
7369 cmake_args .append ('-DLLVM_LIBC_CLANG_TIDY=%s' % clang_tidy )
7470
75- if runtimes_build :
76- projects = ['llvm' , 'clang' ]
77- cmake_args .append ('-DLLVM_ENABLE_RUNTIMES=libc' )
78- else :
79- projects = ['llvm' , 'libc' ]
71+ # TODO: remove once old hdrgen is deleted.
72+ # https://github.com/llvm/llvm-project/pull/117220
73+ projects = ['llvm' , 'clang' ]
74+ cmake_args .append ('-DLLVM_ENABLE_RUNTIMES=libc' )
8075
8176 if args .debug :
8277 cmake_args .append ('-DCMAKE_BUILD_TYPE=Debug' )
@@ -127,12 +122,8 @@ def main(argv):
127122 with step ('build libc-startup' ):
128123 run_command (['ninja' , 'libc-startup' ])
129124
130- if runtimes_build :
131- with step ('check-libc' ):
132- run_command (['ninja' , 'check-libc' ])
133- else :
134- with step ('libc-unit-tests' ):
135- run_command (['ninja' , 'libc-unit-tests' ])
125+ with step ('check-libc' ):
126+ run_command (['ninja' , 'check-libc' ])
136127
137128 if fullbuild and not args .asan :
138129 if gcc_build or ('riscv' in builder_name ):
@@ -146,7 +137,7 @@ def main(argv):
146137 with step ('Benchmark Utils Tests' ):
147138 run_command (['ninja' , 'libc-benchmark-util-tests' ])
148139
149- if not ( fullbuild or runtimes_build ) and x86_64_build :
140+ if not fullbuild and x86_64_build :
150141 with step ('libc-fuzzer' ):
151142 run_command (['ninja' , 'libc-fuzzer' ])
152143
0 commit comments