mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MSVC: allow linking with the cURL library

Browse Source 
Teach the clink.pl script that -lcurl is a request to link with the
cURL library, and drop NO_CURL from config.mak.uname for the MSVC
platform.

Signed-off-by: Marat Radchenko <marat@slonopotamus.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Marat Radchenko
2014-03-27 11:34:27 +04:00
committed by Junio C Hamano
parent cee0c2750b
commit da8daa367b
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,8 @@ while (@ARGV) {
push(@args, "libeay32.lib"); push(@args, "libeay32.lib");
} elsif ("$arg" eq "-lssl") { } elsif ("$arg" eq "-lssl") {
push(@args, "ssleay32.lib"); push(@args, "ssleay32.lib");
} elsif ("$arg" eq "-lcurl") {
push(@args, "libcurl.lib");
} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") { } elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
$arg =~ s/^-L/-LIBPATH:/; $arg =~ s/^-L/-LIBPATH:/;
push(@args, $arg); push(@args, $arg);

1
config.mak.uname
View File

@ -345,7 +345,6 @@ ifeq ($(uname_S),Windows)
UNRELIABLE_FSTAT = UnfortunatelyYes UNRELIABLE_FSTAT = UnfortunatelyYes
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
NO_REGEX = YesPlease NO_REGEX = YesPlease
NO_CURL = YesPlease
NO_GETTEXT = YesPlease NO_GETTEXT = YesPlease
NO_PYTHON = YesPlease NO_PYTHON = YesPlease
BLK_SHA1 = YesPlease BLK_SHA1 = YesPlease