Skip to content

Commit 020d3de

Browse files
committed
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Copy dependencies of the core DLL in `nmake snap` for statically-compiled extensions when packaging builds
2 parents bcf50b7 + 4e9c3e9 commit 020d3de

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

win32/build/mkdist.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,8 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */
209209

210210
/* the core dll */
211211
copy("$build_dir/php.exe", "$dist_dir/php.exe");
212-
copy("$build_dir/$phpdll", "$dist_dir/$phpdll");
212+
/* copy dll and its dependencies */
213+
copy_file_list($build_dir, "$dist_dir", [$phpdll]);
213214

214215
/* and the .lib goes into dev */
215216
$phplib = str_replace(".dll", ".lib", $phpdll);

0 commit comments

Comments
 (0)