shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[cross-project-tests] Add lld as a dependency if in LLVM_ENABLE_PROJECTS

Browse Source 
Differential Revision: https://reviews.llvm.org/D96510

Reviewed by: aprantl
This commit is contained in:
James Henderson 2021-02-09 14:57:03 +00:00
parent 24af0990de
commit 4446a72ad2
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cross-project-tests/CMakeLists.txt
View File

@ -52,7 +52,7 @@ if("lldb" IN_LIST LLVM_ENABLE_PROJECTS)
endif()
# The Windows builder scripts pass -fuse-ld=lld.
if (WIN32)
if (WIN32 OR "lld" IN_LIST LLVM_ENABLE_PROJECTS)
list(APPEND CROSS_PROJECT_TEST_DEPS lld)
endif()

7
cross-project-tests/lit.cfg.py
View File

@ -67,11 +67,14 @@ if is_msvc:
tools.append(ToolSubst('%cdb', '"%s"' % os.path.join(win_sdk, 'Debuggers',
arch, 'cdb.exe')))
# clang_src_dir is not used by these tests, but is required by
# use_clang(), so set it to "".
# clang_src_dir and lld_src_dir are not used by these tests, but are required by
# use_clang() and use_lld() respectively, so set them to "", if needed.
if not hasattr(config, 'clang_src_dir'):
config.clang_src_dir = ""
llvm_config.use_clang()
if not hasattr(config, 'lld_src_dir'):
config.lld_src_dir = ""
llvm_config.use_lld(required=('lld' in config.llvm_enabled_projects))
if config.llvm_use_sanitizer:
# Propagate path to symbolizer for ASan/MSan.

1
cross-project-tests/lit.site.cfg.py.in
View File

@ -15,6 +15,7 @@ config.cross_project_tests_src_root = "@CROSS_PROJECT_TESTS_SOURCE_DIR@"
config.host_triple = "@LLVM_HOST_TRIPLE@"
config.target_triple = "@TARGET_TRIPLE@"
config.is_msvc = lit.util.pythonize_bool("@MSVC@")
config.llvm_enabled_projects = "@LLVM_ENABLE_PROJECTS@".split(";")
config.mlir_src_root = "@MLIR_SOURCE_DIR@"