Merge branch 'rpath' into 'master'

Fix rpath not loaded See merge request redox-os/relibc!1341
2026-05-17 06:17:12 -06:00
parent b16aebd794 0b430660b7
commit 6dc57272a7
1 changed files with 1 additions and 1 deletions
@@ -722,7 +722,7 @@ impl DSO {

                elf::DT_NEEDED => needed.push(entry),
                elf::DT_JMPREL => jmprel = Some(ptr as usize),
-                elf::DT_RUNPATH => runpath = Some(entry), // FIXME(andypython): rpath
+                elf::DT_RPATH | elf::DT_RUNPATH => runpath = Some(entry),
                elf::DT_STRTAB => strtab_offset = Some(relative_idx),
                elf::DT_STRSZ => strtab_size = Some(val),
                elf::DT_SONAME => soname = Some(entry),