Skip to content

Commit 4b0ef87

Browse files
committed
Link phar with OpenSSL library on Windows
This links with OpenSSL library instead of static libeay32, which is not present in Windows OpenSSL builds anymore.
1 parent 83f9c49 commit 4b0ef87

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

ext/phar/config.w32

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,9 @@ if (PHP_PHAR != "no") {
1313
ADD_FLAG("CFLAGS_PHAR", "/D COMPILE_DL_PHAR ");
1414
}
1515
if (PHP_PHAR_NATIVE_SSL != "no") {
16-
if (CHECK_LIB("libeay32st.lib", "phar")) {
17-
/* We don't really need GDI for this, but there's no
18-
way to avoid linking it in the static openssl build */
19-
ADD_FLAG("LIBS_PHAR", "libeay32st.lib gdi32.lib");
20-
if (PHP_DEBUG == "no") {
21-
/* Silence irrelevant-to-us warning in release builds */
22-
ADD_FLAG("LDFLAGS_PHAR", "/IGNORE:4089 ");
23-
}
16+
var ret = SETUP_OPENSSL("phar", PHP_PHAR);
17+
18+
if (ret >= 2) {
2419
AC_DEFINE('PHAR_HAVE_OPENSSL', 1);
2520
STDOUT.WriteLine(' Native OpenSSL support in Phar enabled');
2621
} else {

0 commit comments

Comments
 (0)