NixOS/patchelf
1
0
Fork 0
mirror of https://github.com/NixOS/patchelf.git synced 2025-10-19 02:23:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

when amending rpath don't add empty rpath entries

Browse Source
This commit is contained in:
Jörg Thalheim
2021-08-28 08:29:40 +02:00
parent 354dd23ed4
commit 52a5bb061a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/patchelf.cc
View File

@@ -1459,12 +1459,14 @@ void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op,
if (!rpath) { if (!rpath) {
debug("no RPATH to shrink\n"); debug("no RPATH to shrink\n");
return; return;
} ;}
newRPath = shrinkRPath(rpath, neededLibs, allowedRpathPrefixes); newRPath = shrinkRPath(rpath, neededLibs, allowedRpathPrefixes);
break; break;
} }
case rpAdd: { case rpAdd: {
newRPath = std::string(rpath ? rpath : "") + ":" + newRPath; auto temp = std::string(rpath ? rpath : "");
appendRPath(temp, newRPath);
newRPath = temp;
break; break;
} }
case rpSet: { break; } /* new rpath was provied as input to this function */ case rpSet: { break; } /* new rpath was provied as input to this function */