opensourcemirror
/
git
mirror of https://github.com/git/git.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Sync with maint 

* maint:
  msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x
This commit is contained in:
Junio C Hamano 2020-01-16 15:18:46 -08:00
parent d0654dc308 b6d4d82bd5
commit 232378479e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compat/vcbuild/scripts/clink.pl
View File

@ -45,9 +45,9 @@ while (@ARGV) {
} elsif ("$arg" eq "-liconv") { } elsif ("$arg" eq "-liconv") {
push(@args, "libiconv.lib"); push(@args, "libiconv.lib");
} elsif ("$arg" eq "-lcrypto") { } elsif ("$arg" eq "-lcrypto") {
push(@args, "libeay32.lib"); push(@args, "libcrypto.lib");
} elsif ("$arg" eq "-lssl") { } elsif ("$arg" eq "-lssl") {
push(@args, "ssleay32.lib"); push(@args, "libssl.lib");
} elsif ("$arg" eq "-lcurl") { } elsif ("$arg" eq "-lcurl") {
my $lib = ""; my $lib = "";
# Newer vcpkg definitions call this libcurl_imp.lib; Do we # Newer vcpkg definitions call this libcurl_imp.lib; Do we

4
contrib/buildsystems/engine.pl
View File

@ -343,9 +343,9 @@ sub handleLinkLine
} elsif ("$part" eq "-lz") { } elsif ("$part" eq "-lz") {
push(@libs, "zlib.lib"); push(@libs, "zlib.lib");
} elsif ("$part" eq "-lcrypto") { } elsif ("$part" eq "-lcrypto") {
push(@libs, "libeay32.lib"); push(@libs, "libcrypto.lib");
} elsif ("$part" eq "-lssl") { } elsif ("$part" eq "-lssl") {
push(@libs, "ssleay32.lib"); push(@libs, "libssl.lib");
} elsif ("$part" eq "-lcurl") { } elsif ("$part" eq "-lcurl") {
push(@libs, "libcurl.lib"); push(@libs, "libcurl.lib");
} elsif ("$part" eq "-lexpat") { } elsif ("$part" eq "-lexpat") {