Skip to content

Commit

Permalink
Add enable_runtimes option to Clang builder
Browse files Browse the repository at this point in the history
...and set aarch64-full-2stage to "auto" meaning
that compiler-rt will go in RUNTIMES.

The option already exists in the functions below
this it just needed adding to the arguments.

This is the start of moving all the bots that use compiler-rt
and friends to using ENABLE_RUNTIMES rather than ENABLE_PROJECTS.

(https://discourse.llvm.org/t/should-buildbots-switch-to-enable-runtimes-instead-of-enable-projects-for-compiler-rt/65042)

Differential Revision: https://reviews.llvm.org/D133939
  • Loading branch information
DavidSpickett committed Feb 20, 2023
1 parent cf86f41 commit ca79350
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
1 change: 1 addition & 0 deletions buildbot/osuosl/master/config/builders.py
Expand Up @@ -455,6 +455,7 @@
clean=False,
checkout_flang=True,
checkout_lld=False,
enable_runtimes="auto",
useTwoStage=True,
testStage1=False,
runTestSuite=True,
Expand Down
12 changes: 9 additions & 3 deletions zorg/buildbot/builders/ClangBuilder.py
Expand Up @@ -166,7 +166,9 @@ def getClangCMakeBuildFactory(
checkout_lld=True,
checkout_libcxx=False,
checkout_flang=False,
checkout_test_suite=False):
checkout_test_suite=False,

enable_runtimes=None):
return _getClangCMakeBuildFactory(
clean=clean, checks=checks, cmake=cmake, jobs=jobs, vs=vs,
vs_target_arch=vs_target_arch, useTwoStage=useTwoStage,
Expand All @@ -180,7 +182,8 @@ def getClangCMakeBuildFactory(
checkout_compiler_rt=checkout_compiler_rt,
checkout_libcxx=checkout_libcxx,
checkout_flang=checkout_flang,
checkout_test_suite=checkout_test_suite)
checkout_test_suite=checkout_test_suite,
enable_runtimes=enable_runtimes)

def _getClangCMakeBuildFactory(
clean=True,
Expand Down Expand Up @@ -218,6 +221,8 @@ def _getClangCMakeBuildFactory(
checkout_test_suite=False,
checkout_flang=False,

enable_runtimes=None,

# Upload artifacts to Google Cloud Storage (for the llvmbisect tool)
stage1_upload_directory=None,

Expand Down Expand Up @@ -267,7 +272,8 @@ def _getClangCMakeBuildFactory(

f = LLVMBuildFactory(
depends_on_projects=depends_on_projects,
llvm_srcdir='llvm')
llvm_srcdir='llvm',
enable_runtimes=enable_runtimes)

# Checkout the latest code for LNT
# and the test-suite separately. Le's do this first,
Expand Down

0 comments on commit ca79350

Please sign in to comment.