From b9bf9ddce6b0813df60b346fca7919735f158cd5 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Tue, 21 Aug 2018 15:23:02 +0100
Subject: [PATCH] mkdist.php: recursively check dll dependencies

Fix duplication of recursively checked deps
---
 win32/build/mkdist.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
index a8ae758c6a..de328e08e1 100644
--- a/win32/build/mkdist.php
+++ b/win32/build/mkdist.php
@@ -122,7 +122,11 @@ function get_depends($module)
 			}
 		}
 
-		$per_module_deps[basename($module)][] = $dep;
+		if (!isset($per_module_deps[basename($module)]) || !in_array($dep, $per_module_deps[basename($module)])) {
+			$per_module_deps[basename($module)][] = $dep;
+			//recursively check dll dependencies
+			get_depends($dep);
+		}
 	}
 	fclose($pipes[1]);
 	proc_close($proc);
@@ -335,10 +339,6 @@ Add ADD_DLLS to add extra DLLs like dynamic dependencies for standard
 deps. For example, libenchant.dll loads libenchant_myspell.dll or
 libenchant_ispell.dll
 */
-$ICU_DLLS = $php_build_dir . '/bin/icu*.dll';
-foreach (glob($ICU_DLLS) as $filename) {
-	copy($filename, "$dist_dir/" . basename($filename));
-}
 $ENCHANT_DLLS = array(
 	array('', 'glib-2.dll'),
 	array('', 'gmodule-2.dll'),
-- 
2.40.0