Skip to content

Commit e3b0721

Browse files
mgornytru
authored andcommitted
[llvm] [lit] Fix use_lld() to respect llvm_shlib_dir
Fix the use_lld() to use llvm_shlib_dir similarly to how use_clang() does it. This fixes use_lld() wrongly prepending llvm_libs_dir, i.e. the directory with system-installed LLVM libraries before the build directory of standalone build. As a result, the shared libraries from an earlier version of clang end up being used instead of the newly built version when running the test suite prior to installing. To reproduce the problem, build and install LLVM with dylibs first, e.g.: cmake ../llvm -G Ninja -DCMAKE_BUILD_TYPE=MinSizeRel \ -DCMAKE_INSTALL_PREFIX="${HOME}"/llvm-test \ -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON \ -DLLVM_INSTALL_UTILS=ON ninja install Then build clang against that installation and run tests: export LD_LIBRARY_PATH=~/llvm-test/lib export PATh=~/llvm-test/bin:"${PATH}" cmake ../clang -G Ninja -DCMAKE_BUILD_TYPE=MinSizeRel \ -DCMAKE_INSTALL_PREFIX="${HOME}"/llvm-test \ -DCLANG_LINK_CLANG_DYLIB=ON -DLLVM_BUILD_TESTS=ON \ -DLLVM_EXTERNAL_LIT="${PWD}"/bin/llvm-lit ninja check-clang The tests will be run with LD_LIBRARY_PATH of: /home/${USER}/llvm-test/lib:/home/${USER}/llvm-project/build-clang/lib As a result, installed libclang-cpp will take precedence over the one from build dir. With the patch, the correct path is used, i.e.: /home/${USER}/llvm-project/build-clang/lib:/home/${USER}/llvm-test/lib Differential Revision: https://reviews.llvm.org/D135368 (cherry picked from commit a64ea17)
1 parent dfef316 commit e3b0721

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

llvm/utils/lit/lit/llvm/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ def use_lld(self, additional_tool_dirs=[], required=True,
609609
self.with_environment('PATH', paths, append_path=True)
610610

611611
lib_dir_props = [self.config.name.lower() + '_libs_dir',
612-
'lld_libs_dir', 'llvm_libs_dir']
612+
'lld_libs_dir', 'llvm_shlib_dir', 'llvm_libs_dir']
613613
lib_paths = [getattr(self.config, pp) for pp in lib_dir_props
614614
if getattr(self.config, pp, None)]
615615

0 commit comments

Comments
 (0)