summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-07-29 20:08:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-29 21:51:43 (GMT)
commit1a537ecfbb9640744b6e8e523e13abf4e2641a3d (patch)
treee00d148c016d0a1c72e7c3aa1e6633886a3e8c94 /contrib
parent9103a75c584dd6edddfcb3004974a1bb48d9214c (diff)
downloadgit-1a537ecfbb9640744b6e8e523e13abf4e2641a3d.zip
git-1a537ecfbb9640744b6e8e523e13abf4e2641a3d.tar.gz
git-1a537ecfbb9640744b6e8e523e13abf4e2641a3d.tar.bz2
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')
-rwxr-xr-xcontrib/buildsystems/engine.pl2
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index d613277..c35844a 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)$/) {