deploy_tool

2021-04-18 19:36:21 +03:00
parent e783865d3b
commit 81d36618e3
1 changed files with 7 additions and 3 deletions
--- 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