mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rust-lld: add rpath to the root LLVM shared lib

Browse source 
rust-lld is not located in the same directory as the other binaries that
point to ../lib, but in a deeper directory in lib. So we need to point
a few layers up for rust-lld to find the LLVM shared library without
rustup's LD_LIBRARY_PATH overrides.
This commit is contained in:
Rémy Rakic 2023-06-03 16:19:09 +00:00
parent 7d5b746e1c
commit 17d321cd11
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/bootstrap/llvm.rs
View file

@ -834,6 +834,30 @@ impl Step for Lld {
}
}
// LLD is built as an LLVM tool, but is distributed outside of the `llvm-tools` component,
// which impacts where it expects to find LLVM's shared library. This causes #80703.
//
// LLD is distributed at "$root/lib/rustlib/$host/bin/rust-lld", but the `libLLVM-*.so` it
// needs is distributed at "$root/lib". The default rpath of "$ORIGIN/../lib" points at the
// lib path for LLVM tools, not the one for rust binaries.
//
// (The `llvm-tools` component copies the .so there for the other tools, and with that
// component installed, one can successfully invoke `rust-lld` directly without rustup's
// `LD_LIBRARY_PATH` overrides)
//
if builder.config.rust_rpath
&& builder.config.llvm_link_shared()
&& target.contains("linux")
{
// So we inform LLD where it can find LLVM's libraries by adding an rpath entry to the
// expected parent `lib` directory.
//
// Be careful when changing this path, we need to ensure it's quoted or escaped:
// `$ORIGIN` would otherwise be expanded when the `LdFlags` are passed verbatim to
// cmake.
ldflags.push_all("-Wl,-rpath,'$ORIGIN/../../../'");
}
configure_cmake(builder, target, &mut cfg, true, ldflags, &[]);
configure_llvm(builder, target, &mut cfg);