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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jan 15, 2020 at 22:57 UTC
b6d4d82bd5a49197d5d2f4f81c08da0d461cfcf1
2 files changed
+4
-4
compat/vcbuild/scripts/clink.pl
+2
-2
@@ -45,9 +45,9 @@ while (@ARGV) {
45
} elsif ("$arg" eq "-liconv") {
46
push(@args, "libiconv.lib");
47
} elsif ("$arg" eq "-lcrypto") {
48
- push(@args, "libeay32.lib");
48
+ push(@args, "libcrypto.lib");
49
} elsif ("$arg" eq "-lssl") {
50
- push(@args, "ssleay32.lib");
50
+ push(@args, "libssl.lib");
51
} elsif ("$arg" eq "-lcurl") {
52
my $lib = "";
53
# Newer vcpkg definitions call this libcurl_imp.lib; Do we
contrib/buildsystems/engine.pl
+2
-2
@@ -343,9 +343,9 @@ sub handleLinkLine
343
} elsif ("$part" eq "-lz") {
344
push(@libs, "zlib.lib");
345
} elsif ("$part" eq "-lcrypto") {
346
- push(@libs, "libeay32.lib");
346
+ push(@libs, "libcrypto.lib");
347
} elsif ("$part" eq "-lssl") {
348
- push(@libs, "ssleay32.lib");
348
+ push(@libs, "libssl.lib");
349
} elsif ("$part" eq "-lcurl") {
350
push(@libs, "libcurl.lib");
351
} elsif ("$part" eq "-lexpat") {