Author: Michał Górny Date: 2022-10-10T08:48:56+02:00 New Revision: c0748fe6dec5927bb343c2bb25741fc5d0d280a2
URL: https://github.com/llvm/llvm-project/commit/c0748fe6dec5927bb343c2bb25741fc5d0d280a2 DIFF: https://github.com/llvm/llvm-project/commit/c0748fe6dec5927bb343c2bb25741fc5d0d280a2.diff LOG: [clang-tools-extra] [clangd] Respect llvm_shlib_dir in tests Add llvm_shlib_dir to variables used in clangd test suite, consistently to how it is used in the test suites of clang, clang-tools-extra and a few other components. This is necessary to ensure that the correct shared libraries are used when building clang standalone -- otherwise, use_clang() sets LD_LIBRARY_PATH to the directory containing the earlier system installation of clang rather than the just-built library. Differential Revision: https://reviews.llvm.org/D135062 (cherry picked from commit 77945a344c3dee3f9735744c8d4151ef2cec6a8d) Added: Modified: clang-tools-extra/clangd/test/lit.site.cfg.py.in Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/test/lit.site.cfg.py.in b/clang-tools-extra/clangd/test/lit.site.cfg.py.in index 20caa72af3da1..1fe7c8d0f3244 100644 --- a/clang-tools-extra/clangd/test/lit.site.cfg.py.in +++ b/clang-tools-extra/clangd/test/lit.site.cfg.py.in @@ -10,6 +10,7 @@ config.python_executable = "@Python3_EXECUTABLE@" 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.llvm_shlib_dir = "@SHLIBDIR@" config.clangd_source_dir = "@CMAKE_CURRENT_SOURCE_DIR@/.." config.clangd_binary_dir = "@CMAKE_CURRENT_BINARY_DIR@/.." _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits