Skip to content

Commit 6f1c7d4

Browse files
boomanaiden154github-actions[bot]
authored andcommitted
Automerge: [clang] Prefer clang_setup over use_clang
This patch switches over uses of use_clang to clang_setup to fix a potential race condition that has been impacting CI. This is split from the refactoring to ensure I'm not missing anything major here on the clang-tools-extra side. This should fix #145703. Reviewers: AaronBallman, HighCommander4, HerrCai0907, petrhosek, Keenuts Reviewed By: petrhosek Pull Request: llvm/llvm-project#147437
2 parents b721912 + 896575e commit 6f1c7d4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

clang-tools-extra/clangd/test/lit.cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import lit.llvm
22

33
lit.llvm.initialize(lit_config, config)
4-
lit.llvm.llvm_config.use_clang([], [], required=False)
4+
lit.llvm.llvm_config.clang_setup()
55
lit.llvm.llvm_config.use_default_substitutions()
66

77
config.name = "Clangd"

clang-tools-extra/test/lit.cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
config.test_exec_root = os.path.join(config.clang_tools_binary_dir, "test")
4343

4444
# Tools need the same environment setup as clang (we don't need clang itself).
45-
llvm_config.use_clang(required=False)
45+
llvm_config.clang_setup()
4646

4747
if config.clang_tidy_staticanalyzer:
4848
config.available_features.add("static-analyzer")

0 commit comments

Comments
 (0)