Skip to content

Commit 438da05

Browse files
authored
[BOLT] Drop BOLT_CLANG_EXE (#182)
As a follow-up to the issue unearthed by llvm/llvm-project#89693, remove all uses of BOLT_CLANG_EXE to prevent similar blockers in the future and reduce builder maintenance overhead.
1 parent 8c21096 commit 438da05

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2702,11 +2702,10 @@
27022702
"-DLLVM_APPEND_VC_REV=OFF",
27032703
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
27042704
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
2705-
"-DLLVM_ENABLE_PROJECTS=bolt;lld",
2705+
"-DLLVM_ENABLE_PROJECTS=bolt;clang;lld",
27062706
"-DLLVM_TARGETS_TO_BUILD=X86;AArch64;RISCV",
27072707
"-DLLVM_LINK_LLVM_DYLIB=ON",
27082708
"-DLLVM_ENABLE_LLD=ON",
2709-
"-DBOLT_CLANG_EXE=/usr/bin/clang",
27102709
],
27112710
)},
27122711

@@ -2721,11 +2720,10 @@
27212720
"-DLLVM_APPEND_VC_REV=OFF",
27222721
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
27232722
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
2724-
"-DLLVM_ENABLE_PROJECTS=bolt;lld",
2723+
"-DLLVM_ENABLE_PROJECTS=bolt;clang;lld",
27252724
"-DLLVM_TARGETS_TO_BUILD=X86;AArch64;RISCV",
27262725
"-DBUILD_SHARED_LIBS=ON",
27272726
"-DLLVM_ENABLE_LLD=ON",
2728-
"-DBOLT_CLANG_EXE=/usr/bin/clang",
27292727
],
27302728
)},
27312729

@@ -2769,11 +2767,10 @@
27692767
"-DLLVM_APPEND_VC_REV=OFF",
27702768
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
27712769
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
2772-
"-DLLVM_ENABLE_PROJECTS=bolt;lld",
2770+
"-DLLVM_ENABLE_PROJECTS=bolt;clang;lld",
27732771
"-DLLVM_TARGETS_TO_BUILD=X86;AArch64;RISCV",
27742772
"-DBUILD_SHARED_LIBS=ON",
27752773
"-DLLVM_USE_LINKER=mold",
2776-
"-DBOLT_CLANG_EXE=/usr/bin/clang",
27772774
],
27782775
)},
27792776

0 commit comments

Comments
 (0)