diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-01-17 02:18:46 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-17 02:18:46 +0300 |
| commit | 232378479ee6c66206d47a9be175e3a39682aea6 (patch) | |
| tree | 7861fec64c6d587d0d316ffb5d28f903e83946a7 | |
| parent | d0654dc308b0ba76dd8ed7bbb33c8d8f7aacd783 (diff) | |
| parent | b6d4d82bd5a49197d5d2f4f81c08da0d461cfcf1 (diff) | |
Sync with maint
* maint:
msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
| -rwxr-xr-x | compat/vcbuild/scripts/clink.pl | 4 | ||||
| -rwxr-xr-x | contrib/buildsystems/engine.pl | 4 |
2 files changed, 4 insertions, 4 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 diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index fba8a3f056..070978506a 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -343,9 +343,9 @@ sub handleLinkLine } elsif ("$part" eq "-lz") { push(@libs, "zlib.lib"); } elsif ("$part" eq "-lcrypto") { - push(@libs, "libeay32.lib"); + push(@libs, "libcrypto.lib"); } elsif ("$part" eq "-lssl") { - push(@libs, "ssleay32.lib"); + push(@libs, "libssl.lib"); } elsif ("$part" eq "-lcurl") { push(@libs, "libcurl.lib"); } elsif ("$part" eq "-lexpat") { |