audacity/linuxdeploy
1
0
Fork 0
mirror of https://github.com/audacity/linuxdeploy.git synced 2026-04-12 21:25:04 -05:00
Code Issues Packages Projects Releases 1 Wiki Activity

Properly set rpath in existing files

Browse Source
This commit is contained in:
TheAssassin
2018-09-03 21:07:43 +02:00
parent 63764e2e18
commit 371343baed
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/appdir.cpp
View File

@@ -820,7 +820,21 @@ namespace linuxdeploy {
if (!d->deployElfDependencies(executable))
return false;
d->setElfRPathOperations[executable] = "$ORIGIN/../lib";
const auto systemElfClass = elf::ElfFile::getSystemElfClass();
const auto elfClass = elf::ElfFile(executable).getElfClass();
std::string libSuffix = "";
if (systemElfClass != elfClass) {
if (elfClass == ELFCLASS32)
libSuffix = "32";
else
libSuffix = "64";
}
std::string rpath = "$ORIGIN/../lib" + libSuffix;
d->setElfRPathOperations[executable] = rpath;
}
for (const auto& sharedLibrary : listSharedLibraries()) {