aboutsummaryrefslogtreecommitdiff
path: root/compat/vcbuild
diff options
context:
space:
mode:
authorMarat Radchenko <marat@slonopotamus.org>2014-03-27 11:34:27 +0400
committerJunio C Hamano <gitster@pobox.com>2014-03-27 12:05:14 -0700
commitda8daa367b7dfe4337252810f6be0c0c31aa93c2 (patch)
tree6bd3765287d9400e7bcdc97e142dd425a20d91dc /compat/vcbuild
parentcee0c2750bb5f1b38f15ef961517e03c2e39c9ec (diff)
downloadgit-da8daa367b7dfe4337252810f6be0c0c31aa93c2.tar.gz
git-da8daa367b7dfe4337252810f6be0c0c31aa93c2.tar.xz
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>
Diffstat (limited to 'compat/vcbuild')
-rwxr-xr-xcompat/vcbuild/scripts/clink.pl2
1 files changed, 2 insertions, 0 deletions
diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
index 4374771df..a87d0da51 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);