Skip to content

Commit 59094a3

Browse files
authored
Decouple Flang from WoA clang buildbot (#399)
This is a follow up patch from #398 and it removes Flang from the clang-arm64-windows-msvc builder. This patch also introduces the following changes to clang-arm64-windows-msvc: 1) Switches to UnifiedTreeBuilder 2) Enables LLVM_ENABLE_RUNTIMES=compiler-rt;openmp 3) Restricts DLLVM_TARGETS_TO_BUILD to AArch64, ARM, and X86
1 parent 94856df commit 59094a3

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -309,15 +309,15 @@
309309
# Clang builders.
310310

311311
{'name': "clang-arm64-windows-msvc",
312-
'tags' : ["llvm", "clang", "lld", "flang"],
312+
'tags' : ["llvm", "clang", "lld"],
313313
'workernames' : ["linaro-armv8-windows-msvc-04"],
314314
'builddir': "clang-arm64-windows-msvc",
315-
'factory' : ClangBuilder.getClangCMakeBuildFactory(
316-
vs="manual",
317-
clean=False,
318-
checkout_flang=True,
319-
checkout_lld=True,
320-
extra_cmake_args=[
315+
'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
316+
depends_on_projects=['llvm', 'clang', 'clang-tools-extra',
317+
'lld', 'compiler-rt', 'openmp'],
318+
checks=['check-all', 'check-runtimes'],
319+
extra_configure_args=[
320+
"-DLLVM_TARGETS_TO_BUILD=X86;ARM;AArch64",
321321
"-DCLANG_DEFAULT_LINKER=lld",
322322
"-DCMAKE_TRY_COMPILE_CONFIGURATION=Release",
323323
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF",

0 commit comments

Comments
 (0)