From 39eb089a730f64d2e8534756a5587c3fe52c5907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Sat, 18 Apr 2020 13:38:05 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@1056 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- utils/deploy_tool/main.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp index c1bb3f76..e8460304 100644 --- a/utils/deploy_tool/main.cpp +++ b/utils/deploy_tool/main.cpp @@ -420,18 +420,19 @@ void patchNameTool() { if (all_libs.contains(fl) || all_libs.contains(sys_lib)) { new_path = "@executable_path/../Frameworks/" + libname; piCout << " depend on lib" << fl; - } - if (frameworks.contains(fname)) { - fl = findLib(fname); - if (fl.isEmpty()) continue; - new_path = "@executable_path/../Frameworks/" + fname + "/" + frameworkInternalPath(sys_lib); - piCout << " depend on framework" << fl; + } else { + if (frameworks.contains(fname)) { + fl = findLib(fname); + if (fl.isEmpty()) continue; + new_path = "@executable_path/../Frameworks/" + fname + "/" + frameworkInternalPath(sys_lib); + piCout << " depend on framework" << fl; + } } if (!new_path.isEmpty() && (sys_lib != new_path)) { cmd = nametool + " -change \"" + sys_lib + "\""; cmd += " \"" + new_path + "\""; cmd += " \"" + local_lib + "\" 2> /dev/null"; - //piCout << " " << cmd; + piCout << " *" << cmd; execute(cmd); } }