From d2fe1964cb970f7dc7868145bd2460a3158ebe60 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: Thu, 16 Apr 2020 15:45:35 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@1049 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- utils/deploy_tool/main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp index 15ee0197..32915256 100644 --- a/utils/deploy_tool/main.cpp +++ b/utils/deploy_tool/main.cpp @@ -385,7 +385,6 @@ void patchNameTool() { patch_list = input_files; patch_list << plugin_libs; piForeach (PIString l, clibs) { - piCout << "ALL:" << l; fi.path = l; patch_list << (out_dir + fi.name()); } @@ -410,7 +409,7 @@ void patchNameTool() { PIString fl = findLib(libname), fname = frameworkName(sys_lib); piCout << " check" << sys_lib << fl; PIString new_path; - if (all_libs.contains(fl)) { + if (all_libs.contains(fl) || all_libs.contains(libname)) { new_path = "@executable_path/../Frameworks/" + libname; piCout << " depend on lib" << fl; } @@ -420,7 +419,7 @@ void patchNameTool() { new_path = "@executable_path/../Frameworks/" + fname + "/" + frameworkInternalPath(sys_lib); piCout << " depend on framework" << fl; } - if (!new_path.isEmpty()) { + if (!new_path.isEmpty() && (sys_lib != new_path)) { cmd = nametool + " -change \"" + sys_lib + "\""; cmd += " \"" + new_path + "\""; cmd += " \"" + local_lib + "\" 2> /dev/null";