nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-05 11:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch an ELF file using --add-rpath

Browse Source
This commit is contained in:
DianQK 2024-06-19 21:32:18 +08:00
parent 4281c2c3d5
commit 80e43c128c
No known key found for this signature in database
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/bootstrap/src/core/download.rs
View File

@ -173,15 +173,10 @@ impl Config {
} }
let mut patchelf = Command::new(nix_deps_dir.join("bin/patchelf")); let mut patchelf = Command::new(nix_deps_dir.join("bin/patchelf"));
let rpath_entries = { patchelf.args(&[
// ORIGIN is a relative default, all binary and dynamic libraries we ship OsString::from("--add-rpath"),
// appear to have this (even when `../lib` is redundant). OsString::from(t!(fs::canonicalize(nix_deps_dir)).join("lib")),
// NOTE: there are only two paths here, delimited by a `:` ]);
let mut entries = OsString::from("$ORIGIN/../lib:");
entries.push(t!(fs::canonicalize(nix_deps_dir)).join("lib"));
entries
};
patchelf.args(&[OsString::from("--set-rpath"), rpath_entries]);
if !path_is_dylib(fname) { if !path_is_dylib(fname) {
// Finally, set the correct .interp for binaries // Finally, set the correct .interp for binaries
let dynamic_linker_path = nix_deps_dir.join("nix-support/dynamic-linker"); let dynamic_linker_path = nix_deps_dir.join("nix-support/dynamic-linker");