Skip to content

Commit d13b9e9

Browse files
committed
Be more liberal regarding zlib(_a).lib
Extensions requiring zlib are looking only for zlib.lib if ext/zlib has been built as shared extension. This is overly restrictive at best, and actually makes no sense, since (a) we're not shipping shared zlib builds for years, and (b) users could have a zlib.lib which is a static build (they could even just rename zlib_a.lib to zlib.lib).
1 parent f5772a9 commit d13b9e9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

win32/build/confutils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3629,7 +3629,7 @@ function ADD_MAKEFILE_FRAGMENT(src_file)
36293629
function SETUP_ZLIB_LIB(target, path_to_check)
36303630
{
36313631
return ((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", target, path_to_check))) ||
3632-
(PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", target, path_to_check)) ||
3632+
(PHP_ZLIB_SHARED && CHECK_LIB("zlib_a.lib;zlib.lib", target, path_to_check)) ||
36333633
(PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED));
36343634
}
36353635

0 commit comments

Comments
 (0)