Skip to content

Commit da8daa3

Browse files
slonopotamusgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent cee0c27 commit da8daa3

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

compat/vcbuild/scripts/clink.pl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
push(@args, "libeay32.lib");
3434
} elsif ("$arg" eq "-lssl") {
3535
push(@args, "ssleay32.lib");
36+
} elsif ("$arg" eq "-lcurl") {
37+
push(@args, "libcurl.lib");
3638
} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
3739
$arg =~ s/^-L/-LIBPATH:/;
3840
push(@args, $arg);

config.mak.uname

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,6 @@ ifeq ($(uname_S),Windows)
345345
UNRELIABLE_FSTAT = UnfortunatelyYes
346346
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
347347
NO_REGEX = YesPlease
348-
NO_CURL = YesPlease
349348
NO_GETTEXT = YesPlease
350349
NO_PYTHON = YesPlease
351350
BLK_SHA1 = YesPlease

0 commit comments

Comments
 (0)