[BOLT] Add ld.lld substitution
authorAmir Ayupov <aaupov@fb.com>
Thu, 3 Feb 2022 03:08:27 +0000 (19:08 -0800)
committerAmir Ayupov <amir.aupov@gmail.com>
Tue, 8 Feb 2022 04:59:18 +0000 (20:59 -0800)
Register ld.lld substition (tests were failing)

Reviewed By: yota9

Differential Revision: https://reviews.llvm.org/D118738

bolt/test/lit.cfg.py

index 8b2b6d0..9cc8f6b 100644 (file)
@@ -56,9 +56,12 @@ if config.bolt_enable_runtime:
 llvm_config.use_default_substitutions()
 
 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')
+
+llvm_config.config.environment['LD_LLD'] = config.bolt_lld
+ld_lld = llvm_config.use_llvm_tool('ld.lld', required=True, search_env='LD_LLD')
+llvm_config.config.available_features.add('ld.lld')
+llvm_config.add_tool_substitutions([ToolSubst(r'ld\.lld', command=ld_lld)])
 
 config.substitutions.append(('%cflags', '-no-pie -gdwarf-4'))
 config.substitutions.append(('%cxxflags', '-no-pie -gdwarf-4'))