diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-07-29 13:08:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 14:51:43 -0700 |
| commit | 1a537ecfbb9640744b6e8e523e13abf4e2641a3d (patch) | |
| tree | e00d148c016d0a1c72e7c3aa1e6633886a3e8c94 /contrib/buildsystems | |
| parent | 9103a75c584dd6edddfcb3004974a1bb48d9214c (diff) | |
| download | git-1a537ecfbb9640744b6e8e523e13abf4e2641a3d.tar.gz | |
contrib/buildsystems: handle libiconv, too
Git's test suite shows tons of breakages unless Git is compiled
*without* NO_ICONV. That means, in turn, that we need to generate
build definitions *with* libiconv, which in turn implies that we
have to handle the -liconv option properly.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/buildsystems')
| -rwxr-xr-x | contrib/buildsystems/engine.pl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index d613277595..c35844a0c7 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -347,6 +347,8 @@ sub handleLinkLine push(@libs, "ssleay32.lib"); } elsif ("$part" eq "-lcurl") { push(@libs, "libcurl.lib"); + } elsif ("$part" eq "-liconv") { + push(@libs, "libiconv.lib"); } elsif ($part =~ /^-/) { push(@lflags, $part); } elsif ($part =~ /\.(a|lib)$/) { |