[PATCH] D117446: [BOLT][CMAKE] Use BOLT_CLANG_EXE and BOLT_LLD_EXE as is

[Amir Ayupov via Phabricator via llvm-commits]

Amir updated this revision to Diff 400621.
Amir added a comment.

Use CLANG and LLD environment variables, removing the dependence on
https://reviews.llvm.org/D117445


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D117446/new/

https://reviews.llvm.org/D117446

Files:
  bolt/test/lit.cfg.py


Index: bolt/test/lit.cfg.py
===================================================================
--- bolt/test/lit.cfg.py
+++ bolt/test/lit.cfg.py
@@ -55,8 +55,10 @@
 
 llvm_config.use_default_substitutions()
 
-llvm_config.use_clang(additional_tool_dirs=[os.path.dirname(config.bolt_clang)])
-llvm_config.use_lld(additional_tool_dirs=[os.path.dirname(config.bolt_lld)])
+llvm_config.config.environment['CLANG'] = config.bolt_clang
+llvm_config.config.environment['LLD'] = config.bolt_lld
+llvm_config.use_clang()
+llvm_config.use_llvm_tool('lld', required=True, search_env='LLD')
 
 config.substitutions.append(('%cflags', '-no-pie'))
 config.substitutions.append(('%cxxflags', '-no-pie'))


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D117446.400621.patch
Type: text/x-patch
Size: 690 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220117/47de0f9a/attachment.bin>