Skip to content

Commit 1a537ec

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9103a75 commit 1a537ec

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

contrib/buildsystems/engine.pl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,8 @@ sub handleLinkLine
347347
push(@libs, "ssleay32.lib");
348348
} elsif ("$part" eq "-lcurl") {
349349
push(@libs, "libcurl.lib");
350+
} elsif ("$part" eq "-liconv") {
351+
push(@libs, "libiconv.lib");
350352
} elsif ($part =~ /^-/) {
351353
push(@lflags, $part);
352354
} elsif ($part =~ /\.(a|lib)$/) {

0 commit comments

Comments
 (0)