Skip to content

Commit df463d2

Browse files
authored
Fix flang-aarch64-libcxx builder (#432)
After flang-rt, flang-aarch64-libcxx builder started to fail. Before it, llvm libraries, flang and its runtime were built with the host compiler, but now flang runtime is built with the stage 1 clang. The problem is that the C++ library of these compilers may be incompatible. The linked issue has more details. To avoid this issue, use the out of tree flang builder to build llvm, flang and flang-rt with the host compiler, using libcxx. Fixes llvm/llvm-project#135381
1 parent 00b7bb4 commit df463d2

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2527,21 +2527,27 @@
25272527
'tags' : ['flang'],
25282528
'workernames' : ["linaro-flang-aarch64-libcxx"],
25292529
'builddir': "flang-aarch64-libcxx",
2530-
'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
2531-
clean=True,
2532-
checks=['check-flang','check-flang-rt'],
2533-
depends_on_projects=['llvm','mlir','clang','flang','flang-rt'],
2534-
extra_configure_args=[
2530+
'factory' : FlangBuilder.getFlangOutOfTreeBuildFactory(
2531+
checks=['check-flang'],
2532+
llvm_extra_configure_args=[
25352533
"-DLLVM_TARGETS_TO_BUILD=AArch64",
2536-
"-DLLVM_INSTALL_UTILS=ON",
25372534
"-DCMAKE_CXX_STANDARD=17",
25382535
"-DLLVM_ENABLE_WERROR=OFF",
2536+
"-DLLVM_ENABLE_ASSERTIONS=ON",
2537+
"-DLLVM_ENABLE_LIBCXX=On",
2538+
"-DCMAKE_BUILD_TYPE=Release",
2539+
],
2540+
flang_extra_configure_args=[
25392541
"-DFLANG_ENABLE_WERROR=ON",
2540-
"-DBUILD_SHARED_LIBS=ON",
25412542
"-DLLVM_ENABLE_ASSERTIONS=ON",
25422543
"-DLLVM_ENABLE_LIBCXX=On",
25432544
"-DCMAKE_BUILD_TYPE=Release",
2544-
])},
2545+
],
2546+
flang_rt_extra_configure_args=[
2547+
"-DLLVM_ENABLE_ASSERTIONS=ON",
2548+
"-DLLVM_ENABLE_LIBCXX=On",
2549+
"-DCMAKE_BUILD_TYPE=Release",
2550+
])},
25452551

25462552
{'name' : "flang-aarch64-release",
25472553
'tags' : ["flang"],

0 commit comments

Comments
 (0)