From 81d36618e34ec74bf88dec50adfdaa3660f95f9b Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 18 Apr 2021 19:36:21 +0300 Subject: [PATCH] deploy_tool --- utils/deploy_tool/main.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp index e5275707..1464671a 100644 --- a/utils/deploy_tool/main.cpp +++ b/utils/deploy_tool/main.cpp @@ -654,9 +654,7 @@ int main(int argc, char * argv[]) { }); if (!rpath.isEmpty()) { - PIStringList patch_list = input_files; - patch_list << plugin_libs; - patch_list.forEach([&](const PIString & f){ + input_files.forEach([&](const PIString & f){ patchRPath(f); }); } @@ -708,6 +706,12 @@ int main(int argc, char * argv[]) { } } + if (!rpath.isEmpty()) { + plugin_libs.forEach([&](const PIString & f){ + patchRPath(f); + }); + } + #ifdef WINDOWS out_dir.replaceAll("/", "\\"); #endif