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_bootstrap_builder (builder_name ):
1916 return 'bootstrap' in builder_name
2017
@@ -44,7 +41,6 @@ def main(argv):
4441 source_dir = os .path .join ('..' , 'llvm-project' )
4542 builder_name = os .environ .get ('BUILDBOT_BUILDERNAME' )
4643 fullbuild = is_fullbuild_builder (builder_name )
47- runtimes_build = is_runtimes_builder (builder_name )
4844 bootstrap_build = is_bootstrap_builder (builder_name )
4945 gcc_build = is_gcc_builder (builder_name )
5046 lint_build = is_lint_builder (builder_name )
@@ -71,16 +67,14 @@ def main(argv):
7167 # explicit here, which reduces one step of setting environment
7268 # variables when setting up workers.
7369 cmake_args = ['-GNinja' ,
70+ '-DLLVM_ENABLE_RUNTIMES=libc' ,
7471 '-DCMAKE_C_COMPILER=%s' % cc ,
7572 '-DCMAKE_CXX_COMPILER=%s' % cxx ]
7673 if lint_build :
7774 cmake_args .append ('-DLLVM_LIBC_CLANG_TIDY=%s' % clang_tidy )
7875
79- if runtimes_build or bootstrap_build :
76+ if bootstrap_build :
8077 projects = ['clang' ]
81- cmake_args .append ('-DLLVM_ENABLE_RUNTIMES=libc' )
82- else :
83- projects = ['libc' ]
8478
8579 if args .debug :
8680 cmake_args .append ('-DCMAKE_BUILD_TYPE=Debug' )
@@ -131,7 +125,7 @@ def main(argv):
131125 with step ('build libc-startup' ):
132126 run_command (['ninja' , 'libc-startup' ])
133127
134- if runtimes_build or bootstrap_build :
128+ if bootstrap_build :
135129 with step ('check-libc' ):
136130 run_command (['ninja' , 'check-libc' ])
137131 else :
@@ -150,7 +144,7 @@ def main(argv):
150144 with step ('Benchmark Utils Tests' ):
151145 run_command (['ninja' , 'libc-benchmark-util-tests' ])
152146
153- if not (fullbuild or runtimes_build or bootstrap_build ) and x86_64_build :
147+ if not (fullbuild or bootstrap_build ) and x86_64_build :
154148 with step ('libc-fuzzer' ):
155149 run_command (['ninja' , 'libc-fuzzer' ])
156150
0 commit comments