status-im
/
macdylibbundler
mirror of https://github.com/status-im/macdylibbundler.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #45 from SCG82/handle-loader-path 

Handle @loader_path
This commit is contained in:
auriamg 2019-12-23 20:30:35 -05:00 committed by GitHub
parent 9b646f4bb3 e228020b16
commit cd6581d3ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/DylibBundler.cpp
View File

@ -53,7 +53,7 @@ void changeLibPathsOnFile(std::string file_to_fix)
bool isRpath(const std::string& path)
{
return path.find("@rpath") == 0;
return path.find("@rpath") == 0 || path.find("@loader_path") == 0;
}
void collectRpaths(const std::string& filename)
@ -114,7 +114,7 @@ std::string searchFilenameInRpaths(const std::string& rpath_file)
{
char buffer[PATH_MAX];
std::string fullpath;
std::string suffix = rpath_file.substr(7, rpath_file.size()-6);
std::string suffix = rpath_file.substr(rpath_file.rfind("/")+1);
for (std::set<std::string>::iterator it = rpaths.begin(); it != rpaths.end(); ++it)
{