Skip to content

Commit

Permalink
MSVC: allow linking with the cURL library
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Marat Radchenko authored and Junio C Hamano committed Mar 27, 2014
1 parent cee0c27 commit da8daa3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 2 additions & 0 deletions compat/vcbuild/scripts/clink.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
push(@args, "libeay32.lib");
} elsif ("$arg" eq "-lssl") {
push(@args, "ssleay32.lib");
} elsif ("$arg" eq "-lcurl") {
push(@args, "libcurl.lib");
} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
$arg =~ s/^-L/-LIBPATH:/;
push(@args, $arg);
Expand Down
1 change: 0 additions & 1 deletion config.mak.uname
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,6 @@ ifeq ($(uname_S),Windows)
UNRELIABLE_FSTAT = UnfortunatelyYes
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
NO_REGEX = YesPlease
NO_CURL = YesPlease
NO_GETTEXT = YesPlease
NO_PYTHON = YesPlease
BLK_SHA1 = YesPlease
Expand Down

0 comments on commit da8daa3

Please sign in to comment.