[cmake] Provide CURRENT_TOOLS_DIR centrally, replacing CLANG_TOOLS_DIR

[sammccall]

Summary

CLANG_TOOLS_DIR holds the the current bin/ directory, maybe with a %(build_mode)
placeholder. It is used to add the just-built binaries to $PATH for lit tests.
In most cases it equals LLVM_TOOLS_DIR, which is used for the same purpose.
But for a standalone build of clang, CLANG_TOOLS_DIR points at the build tree
and LLVM_TOOLS_DIR points at the provided LLVM binaries.

Currently CLANG_TOOLS_DIR is set in clang/test/, clang-tools-extra/test/, and
other things always built with clang. This is a few cryptic lines of CMake in
each place. Meanwhile LLVM_TOOLS_DIR is provided by configure_site_lit_cfg().

This patch moves CLANG_TOOLS_DIR to configure_site_lit_cfg() and renames it:

• there's nothing clang-specific about the value
• it will also replace LLD_TOOLS_DIR, LLDB_TOOLS_DIR etc (not in this patch)

It also defines CURRENT_LIBS_DIR. While I removed the last usage of
CLANG_LIBS_DIR in e4cab4e24d1, there are LLD_LIBS_DIR usages etc that
may be live, and I'd like to mechanically update them in a followup patch.

[sammccall]

add gn

[sammccall]

Trolling for reviewers:
@hokein: this is another -10 lines per test suite!
@thakis: the GN changes seem trivial (no standalone build) but wonder if you have opinions
@mgorny: because I don't truly understand the standalone build, and only hope I'm getting this right

[hokein]

I think this patch is probably doing too much: 1. move CLANG_TOOLS_DIR to configure_site_lit_cfg() 2. rename.

Can we split it into two patches? Land the first part, and the second part afterwards.

llvm/cmake/modules/AddLLVM.cmake

1640

the change looks good, but I'm not sure the new name CURRENT_TOOLS_DIR is good, the name seems vague and not significantly better, since it always points at the build tree, maybe LLVM_BUILD_DIR or something similar? (The existing naming pattern looks like project-specific variables are prefixed with the project name LLVM_, CLANG_).

llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn

31

nit: this seems not needed anymore, as we have removed the CLANG_LIBS_DIR from the CMake file already.

[sammccall]

In D121763#3385492, @hokein wrote:

I think this patch is probably doing too much: 1. move CLANG_TOOLS_DIR to configure_site_lit_cfg() 2. rename.

Can we split it into two patches? Land the first part, and the second part afterwards.

I don't think it can reasonably be called CLANG_TOOLS_DIR in that macro, the var has no connection to clang, and is set even when clang is not enabled.

llvm/cmake/modules/AddLLVM.cmake

1640

I agree the new name isn't good. (OTOH *all* these variables seem to have terrible names, so maybe it's just hard). But I think LLVM_BUILD_DIR is worse.

The name needs to communicate a lot of things:

1. that this is parallel to LLVM_TOOLS_DIR, and the successor to $PROJECT_TOOLS_DIR
2. that when LLVM and $PROJECT are built in different paths, this is the dir for $PROJECT and not for LLVM
3. That this is not a concrete directory, but may contain a %(build_mode)% placeholder
4. this variable is part of llvm-project, as opposed to some other CMake project it may be mixed with.

CLANG_TOOLS_DIR passes 1, 2, 4 (and fails 3, which is really hard).
CURRENT_TOOLS_DIR passes 1 & 2 only - it lacks namespacing.
LLVM_BUILD_DIR passes 4 only, I think - it's very unclear how it relates to LLVM_TOOLS_DIR.
LLVM_CURRENT_TOOLS_DIR would pass 1 and 4, but muddies the LLVM-vs-subproject distinction a bit.

What do you think of these criteria, are there some I missed? Any more name ideas? :-)

llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn

31

Agree, I'll make a separate commit to avoid muddying the waters here.

[hokein]

llvm/cmake/modules/AddLLVM.cmake

1640

The name needs to communicate a lot of things:

1. that this is parallel to LLVM_TOOLS_DIR, and the successor to $PROJECT_TOOLS_DIR
2. that when LLVM and $PROJECT are built in different paths, this is the dir for $PROJECT and not for LLVM
3. That this is not a concrete directory, but may contain a %(build_mode)% placeholder
4. this variable is part of llvm-project, as opposed to some other CMake project it may be mixed with.

Thanks, these make sense, I were not aware of all of these and didn't get the full picture. I suppose it is being used for exposing various config.{project}_tools_dir variables for different tools (e.g. config.clang_tools_dir, config.lldb_tools_dir etc).

CURRENT_TOOLS_DIR passes 1 & 2 only - it lacks namespacing.

hmm, I think the new name is somewhat weak on 2 (particularly the PROJECT bit) -- the Current was unclear to me, I guess it means the current project right? I think it'd be better to have the PROJECT in the variable name, LLVM_PROJECT_TOOLS_DIR or shorter PROJECT_TOOLS_DIR. WDYT?

[sammccall]

llvm/cmake/modules/AddLLVM.cmake

1640

The name needs to communicate a lot of things:

1. that this is parallel to LLVM_TOOLS_DIR, and the successor to $PROJECT_TOOLS_DIR
2. that when LLVM and $PROJECT are built in different paths, this is the dir for $PROJECT and not for LLVM
3. That this is not a concrete directory, but may contain a %(build_mode)% placeholder
4. this variable is part of llvm-project, as opposed to some other CMake project it may be mixed with.

Thanks, these make sense, I were not aware of all of these and didn't get the full picture. I suppose it is being used for exposing various config.{project}_tools_dir variables for different tools (e.g. config.clang_tools_dir, config.lldb_tools_dir etc).

That's right. Ultimately it's being used to make sure that when you run lit tests, clang resolves to the clang you just built and not something else.
(It's more complicated than that, there are several conflicting mechanisms, but that's the essence).

CURRENT_TOOLS_DIR passes 1 & 2 only - it lacks namespacing.

hmm, I think the new name is somewhat weak on 2 (particularly the PROJECT bit) -- the Current was unclear to me, I guess it means the current project right?

It really means the current cmake invocation.

In a "standalone build" of clang (rooted at llvm-project/clang, with a separate LLVM tree), it is build/bin where LLVM_TOOLS_DIR is path/to/llvm/bin, and was produced by a *previous* cmake invocation (or an install step).

In a normal unified build of llvm+clang+lld (rooted at llvm-project/llvm with LLVM_ENABLE_PROJECTS), both variables are set to build/bin.

There's really no fixed connection with a subproject at all, and certainly its value doesn't vary across the various subprojects of llvm-project.

I think it'd be better to have the PROJECT in the variable name, LLVM_PROJECT_TOOLS_DIR

I think this name is misleading because of the connection to the repo llvm-project.
It suggests LLVM_PROJECT_TOOLS_DIR is a top-level thing when it's really the opposite, a subproject thing. (And while LLVM_TOOLS_DIR *does* correspond to llvm-project/llvm the tools are often things people think of as "top-level").

or shorter PROJECT_TOOLS_DIR. WDYT?

I can live with it, but I'm not really sure whether PROJECT communicates anything that's true :-)
I'm tempted by just TOOLS_DIR but I worry that such a short name with a lack of namespacing is asking for trouble. On the other hand, there's SHLIBDIR, which also points at shared libs in the current build tree...

[hokein]

llvm/cmake/modules/AddLLVM.cmake

1640

Thanks for the explanations, now I'm convinced, Let's stick with the current name :)

[sammccall]

Rebase. Also update LLD since it's simple and similar to clang.

clang-tools-extra/clangd/test/CMakeLists.txt

-# Set CLANG_TOOLS_DIR to buildtree/bin, or buildtree/%(build_mode)s/bin if the
-# location is dynamic. The latter must be interpolated by lit configs.
-# FIXME: this is duplicated in many places.
-if (CMAKE_CFG_INTDIR STREQUAL ".")
-  set(LLVM_BUILD_MODE ".")
-else ()
-  set(LLVM_BUILD_MODE "%(build_mode)s")
-endif ()
-string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} CLANG_TOOLS_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
-
 set(CLANGD_TEST_DEPS
   clangd
   ClangdTests
   clangd-indexer
   # No tests for it, but we should still make sure they build.
   dexp
   )
 

clang-tools-extra/clangd/test/lit.site.cfg.py.in

 @LIT_SITE_CFG_IN_HEADER@
 
 # Variables needed for common clang config.
 config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
 config.target_triple = "@LLVM_TARGET_TRIPLE@"
 config.host_triple = "@LLVM_HOST_TRIPLE@"
 config.python_executable = "@Python3_EXECUTABLE@"
 # 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.
-config.clang_tools_dir = lit_config.substitute("@CLANG_TOOLS_DIR@")
+config.clang_tools_dir = lit_config.substitute("@CURRENT_TOOLS_DIR@")
 config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_DIR@")
 config.llvm_libs_dir = lit_config.substitute("@LLVM_LIBS_DIR@")
 
 config.clangd_source_dir = "@CMAKE_CURRENT_SOURCE_DIR@/.."
 config.clangd_binary_dir = "@CMAKE_CURRENT_BINARY_DIR@/.."
 config.clangd_build_xpc = @CLANGD_BUILD_XPC@
 config.clangd_enable_remote = @CLANGD_ENABLE_REMOTE@
 config.clangd_tidy_checks = @CLANGD_TIDY_CHECKS@
 config.have_zlib = @LLVM_ENABLE_ZLIB@
 
 # Delegate logic to lit.cfg.py.
 lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg.py")

clang-tools-extra/pseudo/test/CMakeLists.txt

-# Set CLANG_TOOLS_DIR to buildtree/bin, or buildtree/%(build_mode)s/bin if the
-# location is dynamic. The latter must be interpolated by lit configs.
-# FIXME: this is duplicated in many places.
-if (CMAKE_CFG_INTDIR STREQUAL ".")
-  set(LLVM_BUILD_MODE ".")
-else ()
-  set(LLVM_BUILD_MODE "%(build_mode)s")
-endif ()
-string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} CLANG_TOOLS_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
-
 set(CLANG_PSEUDO_TEST_DEPS
   clang-pseudo
   ClangPseudoTests
   )
 
 foreach(dep FileCheck not)
   if(TARGET ${dep})
     list(APPEND CLANG_PSEUDO_TEST_DEPS ${dep})

clang-tools-extra/pseudo/test/lit.site.cfg.py.in

 @LIT_SITE_CFG_IN_HEADER@
 
 # Variables needed for common llvm config.
-config.clang_tools_dir = "@CLANG_TOOLS_DIR@"
+config.clang_tools_dir = "@CURRENT_TOOLS_DIR@"
 config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
 config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_DIR@")
 config.llvm_libs_dir = lit_config.substitute("@LLVM_LIBS_DIR@")
 config.target_triple = "@TARGET_TRIPLE@"
 config.python_executable = "@Python3_EXECUTABLE@"
 
 config.clang_pseudo_source_dir = "@CMAKE_CURRENT_SOURCE_DIR@/.."
 config.clang_pseudo_binary_dir = "@CMAKE_CURRENT_BINARY_DIR@/.."
 # Delegate logic to lit.cfg.py.
 lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg.py")

clang-tools-extra/test/CMakeLists.txt

 # Test runner infrastructure for Clang-based tools. This configures the Clang
 # test trees for use by Lit, and delegates to LLVM's lit test handlers.
 #
 # Note that currently we don't support stand-alone builds of Clang, you must
 # be building Clang from within a combined LLVM+Clang checkout..
 
 set(CLANG_TOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/..")
 set(CLANG_TOOLS_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/..")
 
-if (CMAKE_CFG_INTDIR STREQUAL ".")
-  set(LLVM_BUILD_MODE ".")
-else ()
-  set(LLVM_BUILD_MODE "%(build_mode)s")
-endif ()
-
-string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} CLANG_TOOLS_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
-
 llvm_canonicalize_cmake_booleans(
   CLANG_TIDY_ENABLE_STATIC_ANALYZER
   CLANG_PLUGIN_SUPPORT
   LLVM_INSTALL_TOOLCHAIN_ONLY
   )
 
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in

clang-tools-extra/test/lit.site.cfg.py.in

 @LIT_SITE_CFG_IN_HEADER@
 
 import sys
 
 config.llvm_plugin_ext = "@LLVM_PLUGIN_EXT@"
 config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
 config.clang_tools_binary_dir = "@CLANG_TOOLS_BINARY_DIR@"
-config.clang_tools_dir = "@CLANG_TOOLS_DIR@"
 config.llvm_shlib_dir = "@SHLIBDIR@"
 config.python_executable = "@Python3_EXECUTABLE@"
 config.target_triple = "@LLVM_TARGET_TRIPLE@"
 config.host_triple = "@LLVM_HOST_TRIPLE@"
 config.clang_tidy_staticanalyzer = @CLANG_TIDY_ENABLE_STATIC_ANALYZER@
 config.has_plugins = @CLANG_PLUGIN_SUPPORT@ & ~@LLVM_INSTALL_TOOLCHAIN_ONLY@
 # 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.
 config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_DIR@")
 config.llvm_libs_dir = lit_config.substitute("@LLVM_LIBS_DIR@")
-config.clang_tools_dir = lit_config.substitute("@CLANG_TOOLS_DIR@")
+config.clang_tools_dir = lit_config.substitute("@CURRENT_TOOLS_DIR@")
 
 import lit.llvm
 lit.llvm.initialize(lit_config, config)
 
 # Let the main config do the real work.
 lit_config.load_config(config, "@CLANG_TOOLS_SOURCE_DIR@/test/lit.cfg.py")

clang/test/CMakeLists.txt

 # Test runner infrastructure for Clang. This configures the Clang test trees
 # for use by Lit, and delegates to LLVM's lit test handlers.
 
-if (CMAKE_CFG_INTDIR STREQUAL ".")
-  set(LLVM_BUILD_MODE ".")
-else ()
-  set(LLVM_BUILD_MODE "%(build_mode)s")
-endif ()
-
-string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} CLANG_TOOLS_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
-
 llvm_canonicalize_cmake_booleans(
   CLANG_BUILD_EXAMPLES
   CLANG_DEFAULT_PIE_ON_LINUX
   CLANG_ENABLE_ARCMT
   CLANG_ENABLE_STATIC_ANALYZER
   CLANG_PLUGIN_SUPPORT
   CLANG_SPAWN_CC1
   ENABLE_BACKTRACES
configure_lit_site_cfg(
   "LLVM_BINARY_DIR"
   "LLVM_TOOLS_DIR"
   "LLVM_LIBS_DIR"
   "SHLIBDIR"
   "LLVM_LIT_TOOLS_DIR"
   "LLVM_EXTERNAL_LIT"
   "CLANG_BINARY_DIR"
   "CLANG_SOURCE_DIR"
-  "CLANG_TOOLS_DIR"
+  "CURRENT_TOOLS_DIR"
   "CMAKE_LIBRARY_OUTPUT_DIRECTORY"
   )
 
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
   ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py
   MAIN_CONFIG
   ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.cfg.py

clang/test/lit.site.cfg.py.in

 @LIT_SITE_CFG_IN_HEADER@
 
 import sys
 
 config.llvm_src_root = path(r"@LLVM_SOURCE_DIR@")
 config.llvm_obj_root = path(r"@LLVM_BINARY_DIR@")
 config.llvm_tools_dir = path(r"@LLVM_TOOLS_DIR@")
 config.llvm_libs_dir = path(r"@LLVM_LIBS_DIR@")
 config.llvm_shlib_dir = path(r"@SHLIBDIR@")
 config.llvm_plugin_ext = "@LLVM_PLUGIN_EXT@"
 config.lit_tools_dir = path(r"@LLVM_LIT_TOOLS_DIR@")
 config.errc_messages = "@LLVM_LIT_ERRC_MESSAGES@"
 config.clang_lit_site_cfg = __file__
 config.clang_obj_root = path(r"@CLANG_BINARY_DIR@")
 config.clang_src_dir = path(r"@CLANG_SOURCE_DIR@")
-config.clang_tools_dir = path(r"@CLANG_TOOLS_DIR@")
+config.clang_tools_dir = path(r"@CURRENT_TOOLS_DIR@")
 config.clang_lib_dir = path(r"@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
 config.host_triple = "@LLVM_HOST_TRIPLE@"
 config.target_triple = "@LLVM_TARGET_TRIPLE@"
 config.host_cc = "@CMAKE_C_COMPILER@"
 config.host_cxx = "@CMAKE_CXX_COMPILER@"
 config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"
 config.have_zlib = @LLVM_ENABLE_ZLIB@
 config.clang_arcmt = @CLANG_ENABLE_ARCMT@

clang/utils/perf-training/CMakeLists.txt

-if (CMAKE_CFG_INTDIR STREQUAL ".")
-  set(LLVM_BUILD_MODE ".")
-else ()
-  set(LLVM_BUILD_MODE "%(build_mode)s")
-endif ()
-
-string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} CLANG_TOOLS_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
-
 set(CLANG_PGO_TRAINING_DATA "${CMAKE_CURRENT_SOURCE_DIR}" CACHE PATH
   "The path to a lit testsuite containing samples for PGO and order file generation"
   )
 
 if(LLVM_BUILD_INSTRUMENTED)
   configure_lit_site_cfg(
     ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
     ${CMAKE_CURRENT_BINARY_DIR}/pgo-data/lit.site.cfg

clang/utils/perf-training/lit.site.cfg.in

 @LIT_SITE_CFG_IN_HEADER@
 
 import sys
 
-config.clang_tools_dir = "@CLANG_TOOLS_DIR@"
+config.clang_tools_dir = "@CURRENT_TOOLS_DIR@"
 config.perf_helper_dir = "@CMAKE_CURRENT_SOURCE_DIR@"
 config.test_exec_root = "@CMAKE_CURRENT_BINARY_DIR@"
 config.test_source_root = "@CLANG_PGO_TRAINING_DATA@"
 config.target_triple = "@LLVM_TARGET_TRIPLE@"
 config.python_exe = "@Python3_EXECUTABLE@"
 
 # 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.

clang/utils/perf-training/order-files.lit.site.cfg.in

 @LIT_SITE_CFG_IN_HEADER@
 
 import sys
 
-config.clang_tools_dir = "@CLANG_TOOLS_DIR@"
+config.clang_tools_dir = "@CURRENT_TOOLS_DIR@"
 config.perf_helper_dir = "@CMAKE_CURRENT_SOURCE_DIR@"
 config.test_exec_root = "@CMAKE_CURRENT_BINARY_DIR@"
 config.test_source_root = "@CLANG_PGO_TRAINING_DATA@"
 config.target_triple = "@LLVM_TARGET_TRIPLE@"
 config.python_exe = "@Python3_EXECUTABLE@"
 
 # 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.

llvm/cmake/modules/AddLLVM.cmake

foreach(c ${LLVM_TARGETS_TO_BUILD})
     set(TARGETS_BUILT "${TARGETS_BUILT} ${c}")
   endforeach(c)
   set(TARGETS_TO_BUILD ${TARGETS_BUILT})
 
   set(SHLIBEXT "${LTDL_SHLIB_EXT}")
 
   set_llvm_build_mode()
 
-  # The below might not be the build tree but provided binary tree.
+  # For standalone builds of subprojects, these might not be the build tree but
+  # a provided binary tree.
   set(LLVM_SOURCE_DIR ${LLVM_MAIN_SRC_DIR})
   set(LLVM_BINARY_DIR ${LLVM_BINARY_DIR})
   string(REPLACE "${CMAKE_CFG_INTDIR}" "${LLVM_BUILD_MODE}" LLVM_TOOLS_DIR "${LLVM_TOOLS_BINARY_DIR}")
   string(REPLACE "${CMAKE_CFG_INTDIR}" "${LLVM_BUILD_MODE}" LLVM_LIBS_DIR  "${LLVM_LIBRARY_DIR}")
-
-  # SHLIBDIR points the build tree.
+  # Like LLVM_{TOOLS,LIBS}_DIR, but pointing at the build tree.
+  string(REPLACE "${CMAKE_CFG_INTDIR}" "${LLVM_BUILD_MODE}" CURRENT_TOOLS_DIR "${LLVM_RUNTIME_OUTPUT_INTDIR}")
+  string(REPLACE "${CMAKE_CFG_INTDIR}" "${LLVM_BUILD_MODE}" CURRENT_LIBS_DIR  "${LLVM_LIBRARY_OUTPUT_INTDIR}")
   string(REPLACE "${CMAKE_CFG_INTDIR}" "${LLVM_BUILD_MODE}" SHLIBDIR "${LLVM_SHLIB_OUTPUT_INTDIR}")
 
   # FIXME: "ENABLE_SHARED" doesn't make sense, since it is used just for
   # plugins. We may rename it.
   if(LLVM_ENABLE_PLUGINS)
     set(ENABLE_SHARED "1")
   else()
     set(ENABLE_SHARED "0")

llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn

write_lit_config("lit_site_cfg") {
 
   extra_values = [
     "CMAKE_CURRENT_BINARY_DIR=" +
         rebase_path(get_label_info("//clang-tools-extra/clangd/test",
                                    "target_out_dir")),
     "CMAKE_CURRENT_SOURCE_DIR=" +
         rebase_path("//clang-tools-extra/clangd/test"),
 
     "CLANG_LIBS_DIR=",  # needed only for shared builds
-    "CLANG_TOOLS_DIR=",
+    "CURRENT_TOOLS_DIR=",
     "CLANGD_ENABLE_REMOTE=0",
     "CLANGD_TIDY_CHECKS=1",
     "LLVM_HOST_TRIPLE=$llvm_current_triple",
     "LLVM_LIT_TOOLS_DIR=",  # Intentionally empty, matches cmake build.
     "LLVM_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
     "LLVM_TARGET_TRIPLE=$llvm_target_triple",
     "Python3_EXECUTABLE=$python_path",
   ]

llvm/utils/gn/secondary/clang-tools-extra/pseudo/test/BUILD.gn

write_lit_config("lit_site_cfg") {
 
   extra_values = [
     "CMAKE_CURRENT_BINARY_DIR=" +
         rebase_path(get_label_info("//clang-tools-extra/pseudo/test",
                                    "target_out_dir")),
     "CMAKE_CURRENT_SOURCE_DIR=" +
         rebase_path("//clang-tools-extra/pseudo/test"),
 
-    "CLANG_TOOLS_DIR=",
+    "CURRENT_TOOLS_DIR=",
     "LLVM_LIT_TOOLS_DIR=",  # Intentionally empty, matches cmake build.
     "LLVM_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
     "TARGET_TRIPLE=$llvm_target_triple",
     "Python3_EXECUTABLE=$python_path",
   ]
 }
 
 write_lit_config("lit_unit_site_cfg") {

llvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn

 }
 
 write_lit_config("lit_site_cfg") {
   # Fully-qualified instead of relative for LIT_SITE_CFG_IN_HEADER.
   input = "//clang-tools-extra/test/lit.site.cfg.py.in"
   output = clang_tools_extra_lit_site_cfg_file
 
   extra_values = [
-    "CLANG_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
+    "CURRENT_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
     "CLANG_PLUGIN_SUPPORT=0",
     "LLVM_HOST_TRIPLE=$llvm_current_triple",
     "LLVM_INSTALL_TOOLCHAIN_ONLY=0",
     "LLVM_LIT_TOOLS_DIR=",  # Intentionally empty, matches cmake build.
     "LLVM_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
     "Python3_EXECUTABLE=$python_path",
   ]
 

llvm/utils/gn/secondary/clang/test/BUILD.gn

write_lit_config("lit_site_cfg") {
   output = clang_lit_site_cfg_file
   dir = get_path_info(output, "dir")
   extra_values = [
     "LLVM_WITH_Z3=0",
     "CLANG_BUILD_EXAMPLES=0",
     "CLANG_DEFAULT_CXX_STDLIB=",  # Empty string means "default value" here.
     "CLANG_DEFAULT_PIE_ON_LINUX=0",
     "CLANG_PLUGIN_SUPPORT=0",  # FIXME: Analysis/plugins need global -fPIC
-    "CLANG_TOOLS_DIR=" + rebase_path("$root_out_dir/bin", dir),
+    "CURRENT_TOOLS_DIR=" + rebase_path("$root_out_dir/bin", dir),
     "CLANG_VENDOR_UTI=org.llvm.clang",
 
     # This is only used if LLVM_USE_SANITIZER includes lsan and the host
     # OS is macOS. Since the GN build currently never uses LLVM_USE_SANITIZER,
     # this is never read.  If it's ever needed,
     # utils/gn/build/toolchain/BUILD.gn should get the compiler from a variable
     # that's also read here -- but that should happen after multi-toolchain
     # builds exist, to make sure it's a toolchain var.