path: root/
diff options
authorDmitry Marakasov <>2014-03-11 18:35:29 (GMT)
committerJunio C Hamano <>2014-03-11 20:33:15 (GMT)
commit62fb6d03dab0f6d93b1e1fcaef312bf6e2718f17 (patch)
tree9ed606971dc178589b291da384547f0c0a7a2349 /
parent2f93541d88fadd1ff5307d81c2c8921ee3eea058 (diff)
git-62fb6d03dab0f6d93b1e1fcaef312bf6e2718f17.tar.bz2 link with -liconv for locale_charset()
On e.g. FreeBSD 10.x, the following situation is common: - there's iconv implementation in libc, which has no locale_charset() function - there's GNU libiconv installed from Ports Collection Git build process - detects that iconv is in libc and thus -liconv is not needed for it - detects locale_charset in -liconv, but for some reason doesn't add it to CHARSET_LIB (as it would do with -lcharset if locale_charset() was found there instead of -liconv) - git doesn't build due to unresolved external locale_charset() Fix this by adding -liconv to CHARSET_LIB if locale_charset() is detected in this library. Signed-off-by: Dmitry Marakasov <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to '')
1 files changed, 1 insertions, 1 deletions
diff --git a/ b/
index 2f43393..3f5c644 100644
--- a/
+++ b/
@@ -890,7 +890,7 @@ GIT_CONF_SUBST([HAVE_STRINGS_H])
# and libcharset does
AC_CHECK_LIB([iconv], [locale_charset],
- [],
+ [CHARSET_LIB=-liconv],
[AC_CHECK_LIB([charset], [locale_charset],