Skip to content

Commit b6d4d82

Browse files
dschogitster
authored andcommitted
msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
With the upgrade, the library names changed from libeay32/ssleay32 to libcrypto/libssl. Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 53a06cf commit b6d4d82

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Diff for: compat/vcbuild/scripts/clink.pl

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
} elsif ("$arg" eq "-liconv") {
4646
push(@args, "libiconv.lib");
4747
} elsif ("$arg" eq "-lcrypto") {
48-
push(@args, "libeay32.lib");
48+
push(@args, "libcrypto.lib");
4949
} elsif ("$arg" eq "-lssl") {
50-
push(@args, "ssleay32.lib");
50+
push(@args, "libssl.lib");
5151
} elsif ("$arg" eq "-lcurl") {
5252
my $lib = "";
5353
# Newer vcpkg definitions call this libcurl_imp.lib; Do we

Diff for: contrib/buildsystems/engine.pl

+2-2
Original file line numberDiff line numberDiff line change
@@ -343,9 +343,9 @@ sub handleLinkLine
343343
} elsif ("$part" eq "-lz") {
344344
push(@libs, "zlib.lib");
345345
} elsif ("$part" eq "-lcrypto") {
346-
push(@libs, "libeay32.lib");
346+
push(@libs, "libcrypto.lib");
347347
} elsif ("$part" eq "-lssl") {
348-
push(@libs, "ssleay32.lib");
348+
push(@libs, "libssl.lib");
349349
} elsif ("$part" eq "-lcurl") {
350350
push(@libs, "libcurl.lib");
351351
} elsif ("$part" eq "-lexpat") {

0 commit comments

Comments
 (0)