summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-01-16 23:18:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-01-16 23:18:46 (GMT)
commit232378479ee6c66206d47a9be175e3a39682aea6 (patch)
tree7861fec64c6d587d0d316ffb5d28f903e83946a7 /compat
parentd0654dc308b0ba76dd8ed7bbb33c8d8f7aacd783 (diff)
parentb6d4d82bd5a49197d5d2f4f81c08da0d461cfcf1 (diff)
downloadgit-232378479ee6c66206d47a9be175e3a39682aea6.zip
git-232378479ee6c66206d47a9be175e3a39682aea6.tar.gz
git-232378479ee6c66206d47a9be175e3a39682aea6.tar.bz2
Sync with maint
* maint: msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
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