SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@1056 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2020-04-18 13:38:05 +00:00
parent 32189f730a
commit 39eb089a73
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
utils/deploy_tool/main.cpp
View File

@@ -420,18 +420,19 @@ void patchNameTool() {
if (all_libs.contains(fl) || all_libs.contains(sys_lib)) { if (all_libs.contains(fl) || all_libs.contains(sys_lib)) {
new_path = "@executable_path/../Frameworks/" + libname; new_path = "@executable_path/../Frameworks/" + libname;
piCout << " depend on lib" << fl; piCout << " depend on lib" << fl;
} } else {
if (frameworks.contains(fname)) { if (frameworks.contains(fname)) {
fl = findLib(fname); fl = findLib(fname);
if (fl.isEmpty()) continue; if (fl.isEmpty()) continue;
new_path = "@executable_path/../Frameworks/" + fname + "/" + frameworkInternalPath(sys_lib); new_path = "@executable_path/../Frameworks/" + fname + "/" + frameworkInternalPath(sys_lib);
piCout << " depend on framework" << fl; piCout << " depend on framework" << fl;
}
} }
if (!new_path.isEmpty() && (sys_lib != new_path)) { if (!new_path.isEmpty() && (sys_lib != new_path)) {
cmd = nametool + " -change \"" + sys_lib + "\""; cmd = nametool + " -change \"" + sys_lib + "\"";
cmd += " \"" + new_path + "\""; cmd += " \"" + new_path + "\"";
cmd += " \"" + local_lib + "\" 2> /dev/null"; cmd += " \"" + local_lib + "\" 2> /dev/null";
//piCout << " " << cmd; piCout << " *" << cmd;
execute(cmd); execute(cmd);
} }
} }