summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2020-01-15 22:57:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-01-16 20:18:23 (GMT)
commitb6d4d82bd5a49197d5d2f4f81c08da0d461cfcf1 (patch)
treee3d2c2e8d0d9ca7049cefb32264cf81785d54082 /compat
parent53a06cf39b756eddfe4a2a34da93e3d04eb7b728 (diff)
downloadgit-b6d4d82bd5a49197d5d2f4f81c08da0d461cfcf1.zip
git-b6d4d82bd5a49197d5d2f4f81c08da0d461cfcf1.tar.gz
git-b6d4d82bd5a49197d5d2f4f81c08da0d461cfcf1.tar.bz2
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>
Diffstat (limited to 'compat')
-rwxr-xr-xcompat/vcbuild/scripts/clink.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
index ec95a3b..d9f71b7 100755
--- a/compat/vcbuild/scripts/clink.pl
+++ b/compat/vcbuild/scripts/clink.pl
@@ -45,9 +45,9 @@ while (@ARGV) {
} elsif ("$arg" eq "-liconv") {
push(@args, "libiconv.lib");
} elsif ("$arg" eq "-lcrypto") {
- push(@args, "libeay32.lib");
+ push(@args, "libcrypto.lib");
} elsif ("$arg" eq "-lssl") {
- push(@args, "ssleay32.lib");
+ push(@args, "libssl.lib");
} elsif ("$arg" eq "-lcurl") {
my $lib = "";
# Newer vcpkg definitions call this libcurl_imp.lib; Do we