mirror of
https://github.com/git/git.git
synced 2024-11-18 06:54:55 +01:00
38743b7d10
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>
52 lines
1.4 KiB
Perl
52 lines
1.4 KiB
Perl
#!/usr/bin/perl -w
|
|
######################################################################
|
|
# Compiles or links files
|
|
#
|
|
# This is a wrapper to facilitate the compilation of Git with MSVC
|
|
# using GNU Make as the build system. So, instead of manipulating the
|
|
# Makefile into something nasty, just to support non-space arguments
|
|
# etc, we use this wrapper to fix the command line options
|
|
#
|
|
# Copyright (C) 2009 Marius Storm-Olsen <mstormo@gmail.com>
|
|
######################################################################
|
|
use strict;
|
|
my @args = ();
|
|
my @cflags = ();
|
|
my $is_linking = 0;
|
|
while (@ARGV) {
|
|
my $arg = shift @ARGV;
|
|
if ("$arg" =~ /^-[DIMGO]/) {
|
|
push(@cflags, $arg);
|
|
} elsif ("$arg" eq "-o") {
|
|
my $file_out = shift @ARGV;
|
|
if ("$file_out" =~ /exe$/) {
|
|
$is_linking = 1;
|
|
push(@args, "-OUT:$file_out");
|
|
} else {
|
|
push(@args, "-Fo$file_out");
|
|
}
|
|
} elsif ("$arg" eq "-lz") {
|
|
push(@args, "zlib.lib");
|
|
} elsif ("$arg" eq "-liconv") {
|
|
push(@args, "iconv.lib");
|
|
} elsif ("$arg" eq "-lcrypto") {
|
|
push(@args, "libeay32.lib");
|
|
} elsif ("$arg" eq "-lssl") {
|
|
push(@args, "ssleay32.lib");
|
|
} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
|
|
$arg =~ s/^-L/-LIBPATH:/;
|
|
push(@args, $arg);
|
|
} elsif ("$arg" =~ /^-R/) {
|
|
# eat
|
|
} else {
|
|
push(@args, $arg);
|
|
}
|
|
}
|
|
if ($is_linking) {
|
|
unshift(@args, "link.exe");
|
|
} else {
|
|
unshift(@args, "cl.exe");
|
|
push(@args, @cflags);
|
|
}
|
|
#printf("**** @args\n");
|
|
exit (system(@args) != 0);
|