msvc: Fix an "unrecognized option" linker warning

Having recently added support for building git-imap-send on Windows, we now link against OpenSSL libraries, and the linker issues the following warning: warning LNK4044: unrecognized option '/lssl'; ignored In order to suppress the warning, we change the msvc linker script to translate an '-lssl' parameter to the ssleay32.lib library. Note that the linker script was already including ssleay32.lib (along with libeay32.lib) as part of the translation of the '-lcrypto' library parameter. However, libeay32.dll does not depend on ssleay32.dll and can be used stand-alone, so we remove ssleay32.lib from the '-lcrypto' translation. The dependence of ssleay32.dll on libeay32.dll is represented in the Makefile by the NEEDS_CRYPTO_WITH_SSL build variable. Also, add the corresponding change to the buildsystem generator. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ramsay Jones committed Jan 20, 2010 at 19:25 UTC 38743b7d10cfacca3b1b74ba5edc2bb1cd277597

2 files changed +2

compat/vcbuild/scripts/clink.pl

@@ -31,6 +31,7 @@ while (@ARGV) {

31 push(@args, "iconv.lib");

32 } elsif ("$arg" eq "-lcrypto") {

33 push(@args, "libeay32.lib");

34 + } elsif ("$arg" eq "-lssl") {

35 push(@args, "ssleay32.lib");

36 } elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {

37 $arg =~ s/^-L/-LIBPATH:/;

contrib/buildsystems/engine.pl

@@ -319,6 +319,7 @@ sub handleLinkLine

319 push(@libs, "zlib.lib");

320 } elsif ("$part" eq "-lcrypto") {

321 push(@libs, "libeay32.lib");

322 + } elsif ("$part" eq "-lssl") {

323 push(@libs, "ssleay32.lib");

324 } elsif ($part =~ /^-/) {

325 push(@lflags, $part);