mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-29 04:46:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.1' into PHP-7.2

Browse Source 
* PHP-7.1:
  mkdist.php: recursively check dll dependencies
This commit is contained in:
Anatol Belski 2018-08-23 21:26:40 +02:00
commit 8f43ec1e83
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
win32/build/mkdist.php
View File

@ -123,7 +123,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]); fclose($pipes[1]);
proc_close($proc); 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 deps. For example, libenchant.dll loads libenchant_myspell.dll or
libenchant_ispell.dll 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( $ENCHANT_DLLS = array(
array('', 'glib-2.dll'), array('', 'glib-2.dll'),
array('', 'gmodule-2.dll'), array('', 'gmodule-2.dll'),