summaryrefslogtreecommitdiff
path: root/compat/vcbuild/scripts/clink.pl
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-03-31 16:31:07 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-31 16:31:07 -0700
commit8456113de56a1d1407703b1d4d8e789a54b987c9 (patch)
treebf6c06a82a62d420c1ad1d0ab2c0b5dc8888a07b /compat/vcbuild/scripts/clink.pl
parentMerge branch 'ib/rev-parse-parseopt-argh' (diff)
parentMSVC: allow linking with the cURL library (diff)
downloadtgif-8456113de56a1d1407703b1d4d8e789a54b987c9.tar.xz
Merge branch 'mr/msvc-link-with-lcurl'
* mr/msvc-link-with-lcurl: MSVC: allow linking with the cURL library
Diffstat (limited to 'compat/vcbuild/scripts/clink.pl')
-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 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);