diff options
| author | Marat Radchenko <marat@slonopotamus.org> | 2014-03-27 11:34:27 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-27 12:05:14 -0700 |
| commit | da8daa367b7dfe4337252810f6be0c0c31aa93c2 (patch) | |
| tree | 6bd3765287d9400e7bcdc97e142dd425a20d91dc | |
| parent | cee0c2750bb5f1b38f15ef961517e03c2e39c9ec (diff) | |
| download | git-da8daa367b7dfe4337252810f6be0c0c31aa93c2.tar.gz | |
MSVC: allow linking with the cURL library
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>
| -rwxr-xr-x | compat/vcbuild/scripts/clink.pl | 2 | ||||
| -rw-r--r-- | config.mak.uname | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl index 4374771df2..a87d0da512 100755 --- a/compat/vcbuild/scripts/clink.pl +++ b/compat/vcbuild/scripts/clink.pl @@ -33,6 +33,8 @@ while (@ARGV) { 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); diff --git a/config.mak.uname b/config.mak.uname index 7d31fad241..f1690d6a79 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -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 |