Skip to content

Commit 8f43ec1

Browse files
committed
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: mkdist.php: recursively check dll dependencies
2 parents 1c3d565 + b9bf9dd commit 8f43ec1

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

win32/build/mkdist.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,11 @@ function get_depends($module)
123123
}
124124
}
125125

126-
$per_module_deps[basename($module)][] = $dep;
126+
if (!isset($per_module_deps[basename($module)]) || !in_array($dep, $per_module_deps[basename($module)])) {
127+
$per_module_deps[basename($module)][] = $dep;
128+
//recursively check dll dependencies
129+
get_depends($dep);
130+
}
127131
}
128132
fclose($pipes[1]);
129133
proc_close($proc);
@@ -335,10 +339,6 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */
335339
deps. For example, libenchant.dll loads libenchant_myspell.dll or
336340
libenchant_ispell.dll
337341
*/
338-
$ICU_DLLS = $php_build_dir . '/bin/icu*.dll';
339-
foreach (glob($ICU_DLLS) as $filename) {
340-
copy($filename, "$dist_dir/" . basename($filename));
341-
}
342342
$ENCHANT_DLLS = array(
343343
array('', 'glib-2.dll'),
344344
array('', 'gmodule-2.dll'),

0 commit comments

Comments
 (0)