-
- Downloads
[cmake] Provide CURRENT_TOOLS_DIR centrally, replacing CLANG_TOOLS_DIR
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 e4cab4e2, there are LLD_LIBS_DIR usages etc that may be live, and I'd like to mechanically update them in a followup patch. Differential Revision: https://reviews.llvm.org/D121763
Showing
- clang-tools-extra/clangd/test/CMakeLists.txt 0 additions, 10 deletionsclang-tools-extra/clangd/test/CMakeLists.txt
- clang-tools-extra/clangd/test/lit.site.cfg.py.in 1 addition, 1 deletionclang-tools-extra/clangd/test/lit.site.cfg.py.in
- clang-tools-extra/pseudo/test/CMakeLists.txt 0 additions, 10 deletionsclang-tools-extra/pseudo/test/CMakeLists.txt
- clang-tools-extra/pseudo/test/lit.site.cfg.py.in 1 addition, 1 deletionclang-tools-extra/pseudo/test/lit.site.cfg.py.in
- clang-tools-extra/test/CMakeLists.txt 0 additions, 8 deletionsclang-tools-extra/test/CMakeLists.txt
- clang-tools-extra/test/lit.site.cfg.py.in 1 addition, 2 deletionsclang-tools-extra/test/lit.site.cfg.py.in
- clang/test/CMakeLists.txt 1 addition, 9 deletionsclang/test/CMakeLists.txt
- clang/test/lit.site.cfg.py.in 1 addition, 1 deletionclang/test/lit.site.cfg.py.in
- clang/utils/perf-training/CMakeLists.txt 0 additions, 8 deletionsclang/utils/perf-training/CMakeLists.txt
- clang/utils/perf-training/lit.site.cfg.in 1 addition, 1 deletionclang/utils/perf-training/lit.site.cfg.in
- clang/utils/perf-training/order-files.lit.site.cfg.in 1 addition, 1 deletionclang/utils/perf-training/order-files.lit.site.cfg.in
- lld/test/CMakeLists.txt 0 additions, 9 deletionslld/test/CMakeLists.txt
- lld/test/Unit/lit.site.cfg.py.in 2 additions, 2 deletionslld/test/Unit/lit.site.cfg.py.in
- lld/test/lit.site.cfg.py.in 2 additions, 2 deletionslld/test/lit.site.cfg.py.in
- llvm/cmake/modules/AddLLVM.cmake 5 additions, 3 deletionsllvm/cmake/modules/AddLLVM.cmake
- llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn 1 addition, 1 deletion...utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn
- llvm/utils/gn/secondary/clang-tools-extra/pseudo/test/BUILD.gn 1 addition, 1 deletion...utils/gn/secondary/clang-tools-extra/pseudo/test/BUILD.gn
- llvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn 1 addition, 1 deletionllvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn
- llvm/utils/gn/secondary/clang/test/BUILD.gn 1 addition, 1 deletionllvm/utils/gn/secondary/clang/test/BUILD.gn
- llvm/utils/gn/secondary/lld/test/BUILD.gn 2 additions, 2 deletionsllvm/utils/gn/secondary/lld/test/BUILD.gn
Loading
Please register or sign in to comment