Skip to content

Commit 55d9d45

Browse files
committed
Decouple Flang from WoA clang buildbot
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 63d43f5 commit 55d9d45

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -287,15 +287,16 @@
287287
# Clang builders.
288288

289289
{'name': "clang-arm64-windows-msvc",
290-
'tags' : ["llvm", "clang", "lld", "flang"],
290+
'tags' : ["llvm", "clang", "lld"],
291291
'workernames' : ["linaro-armv8-windows-msvc-04"],
292292
'builddir': "clang-arm64-windows-msvc",
293-
'factory' : ClangBuilder.getClangCMakeBuildFactory(
294-
vs="manual",
295-
clean=False,
296-
checkout_flang=True,
297-
checkout_lld=True,
298-
extra_cmake_args=[
293+
'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
294+
depends_on_projects=['llvm', 'clang', 'clang-tools-extra',
295+
'lld', 'compiler-rt', 'openmp'],
296+
checks=['check-all', 'check-runtimes'],
297+
extra_configure_args=[
298+
"-DLLVM_TARGETS_TO_BUILD=X86;ARM;AArch64",
299+
"-DLLVM_ENABLE_RUNTIMES=compiler-rt;openmp",
299300
"-DCLANG_DEFAULT_LINKER=lld",
300301
"-DCMAKE_TRY_COMPILE_CONFIGURATION=Release",
301302
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF",

0 commit comments

Comments
 (0)