forked from OSchip/llvm-project
Fix utils/update_cc_test_checks/check-globals.test on stand-alone builds
We want to use LLVM_EXTERNAL_LIT if defined for the %lit substitution. Reviewed By: jdenny Differential Revision: https://reviews.llvm.org/D105873
This commit is contained in:
parent
424f14f0d2
commit
303ddb60a2
|
@ -33,6 +33,7 @@ configure_lit_site_cfg(
|
|||
"LLVM_LIBS_DIR"
|
||||
"SHLIBDIR"
|
||||
"LLVM_LIT_TOOLS_DIR"
|
||||
"LLVM_EXTERNAL_LIT"
|
||||
"CLANG_BINARY_DIR"
|
||||
"CLANG_SOURCE_DIR"
|
||||
"CLANG_TOOLS_DIR"
|
||||
|
|
|
@ -34,6 +34,7 @@ config.python_executable = "@Python3_EXECUTABLE@"
|
|||
config.use_z3_solver = lit_config.params.get('USE_Z3_SOLVER', "@USE_Z3_SOLVER@")
|
||||
config.has_plugins = @LLVM_ENABLE_PLUGINS@
|
||||
config.clang_vendor_uti = "@CLANG_VENDOR_UTI@"
|
||||
config.llvm_external_lit = path(r"@LLVM_EXTERNAL_LIT@")
|
||||
|
||||
# Support substitution of the tools and libs dirs with user parameters. This is
|
||||
# used when we can't determine the tool dir at configuration time.
|
||||
|
|
|
@ -19,7 +19,7 @@ extra_args += ' --opt ' + shell_quote(opt_path)
|
|||
script_path = os.path.join(config.llvm_src_root, 'utils',
|
||||
'update_cc_test_checks.py')
|
||||
assert os.path.isfile(script_path)
|
||||
lit = shell_quote(os.path.join(config.llvm_src_root, 'utils', 'lit', 'lit.py'))
|
||||
lit = config.llvm_external_lit if config.llvm_external_lit else shell_quote(os.path.join(config.llvm_src_root, 'utils', 'lit', 'lit.py'))
|
||||
python = shell_quote(config.python_executable)
|
||||
config.substitutions.append(
|
||||
('%update_cc_test_checks', "%s %s %s" % (
|
||||
|
|
Loading…
Reference in New Issue