summaryrefslogtreecommitdiff
path: root/compat/vcbuild
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-01-16 15:18:46 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-01-16 15:18:46 -0800
commit232378479ee6c66206d47a9be175e3a39682aea6 (patch)
tree7861fec64c6d587d0d316ffb5d28f903e83946a7 /compat/vcbuild
parentGit 2.25 (diff)
parentmsvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x (diff)
downloadtgif-232378479ee6c66206d47a9be175e3a39682aea6.tar.xz
Sync with maint
* maint: msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
Diffstat (limited to 'compat/vcbuild')
-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 ec95a3b2d0..d9f71b7cbb 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