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

[jhenderson]

Summary

Depends on D96509.

[jhenderson]

Rebase and ping!

[jhenderson]

Rebase.

[jhenderson]

Update mechanism used to call use_lld() to match the use_clang() invocation (see also D96511).

[jhenderson]

Ping!

I've removed reference to the "feature" for LLD from the title: this is covered by D101997.

[jhenderson]

Ping!

[aprantl]

Seems plausible.

cross-project-tests/CMakeLists.txt

if("compiler-rt" IN_LIST LLVM_ENABLE_PROJECTS)
   endif()
 endif()
 # Many dexter tests depend on lldb.
 if("lldb" IN_LIST LLVM_ENABLE_PROJECTS)
   list(APPEND CROSS_PROJECT_TEST_DEPS lldb lldb-server)
 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()
 
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
   MAIN_CONFIG
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py

cross-project-tests/lit.cfg.py

if is_msvc:
     arch = 'x64'
     llvm_config.with_system_environment(['LIB', 'LIBPATH', 'INCLUDE'])
     # Clear _NT_SYMBOL_PATH to prevent cdb from attempting to load symbols from
     # the network.
     llvm_config.with_environment('_NT_SYMBOL_PATH', '')
     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.
     llvm_config.with_system_environment(
         ['ASAN_SYMBOLIZER_PATH', 'MSAN_SYMBOLIZER_PATH'])
 
 def add_host_triple(clang):
   return '{} --target={}'.format(clang, config.host_triple)

cross-project-tests/lit.site.cfg.py.in

 config.llvm_shlib_dir = "@SHLIBDIR@"
 config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
 config.llvm_plugin_ext = "@LLVM_PLUGIN_EXT@"
 config.cross_project_tests_obj_root = "@CROSS_PROJECT_TESTS_BINARY_DIR@"
 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@"
 
 config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"
 
 # Support substitution of the tools_dir with user parameters. This is
 # used when we can't determine the tool dir at configuration time.
 try: