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

nested parallel_for_lops (this will almost certainly fail)

This commit is contained in:
SCG82 2019-12-13 00:23:17 -08:00
parent 7773790eb0
commit a8f7f48b70
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/DylibBundler.cpp
View File

@ -317,7 +317,10 @@ void doneWithDeps_go()
createDestDir(); createDestDir();
parallel_for_each(deps.begin(), deps.end(), [](Dependency& dep) { parallel_for_each(deps.begin(), deps.end(), [](Dependency& dep) {
dep.copyYourself(); dep.copyYourself();
changeLibPathsOnFile(dep.getInstallPath()); std::cout << "\n* Fixing dependencies on " << dep.getInstallPath().c_str() << std::endl;
parallel_for_each(deps.begin(), deps.end(), [&](Dependency& dep) {
dep.fixFileThatDependsOnMe(dep.getInstallPath());
});
fixRpathsOnFile(dep.getOriginalPath(), dep.getInstallPath()); fixRpathsOnFile(dep.getOriginalPath(), dep.getInstallPath());
}); });
} }
@ -326,7 +329,11 @@ void doneWithDeps_go()
const int fileToFixAmount = Settings::fileToFixAmount(); const int fileToFixAmount = Settings::fileToFixAmount();
parallel_for_each(files.begin(), files.end(), [](const std::string& file) { parallel_for_each(files.begin(), files.end(), [](const std::string& file) {
changeLibPathsOnFile(file); std::cout << "\n* Fixing dependencies on " << file.c_str() << std::endl;
const int dep_amount = deps.size();
parallel_for_each(deps.begin(), deps.end(), [&](Dependency& dep) {
dep.fixFileThatDependsOnMe(file);
});
fixRpathsOnFile(file, file); fixRpathsOnFile(file, file);
}); });
} }