aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArjen Laarhoven <arjen@yaph.org>2007-04-07 01:49:17 +0200
committerJunio C Hamano <junkio@cox.net>2007-04-06 21:29:15 -0700
commit63b4b7a7ed657f406eb274f88a7e2c61fd6fe958 (patch)
treee0f12da873649c9692c69756ecc4a6762a492b3b
parentd93f7c1817f8b9e8bbb2e8ed70e87e84bc55b9f2 (diff)
downloadgit-63b4b7a7ed657f406eb274f88a7e2c61fd6fe958.tar.gz
git-63b4b7a7ed657f406eb274f88a7e2c61fd6fe958.tar.xz
Makefile: iconv() on Darwin has the old interface
The libiconv on Darwin uses the old iconv() interface (2nd argument is a const char **, instead of a char **). Add OLD_ICONV to the Darwin variable definitions to handle this. Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Acked-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 81dafe5ee..dcdaa02e4 100644
--- a/Makefile
+++ b/Makefile
@@ -356,6 +356,7 @@ endif
ifeq ($(uname_S),Darwin)
NEEDS_SSL_WITH_CRYPTO = YesPlease
NEEDS_LIBICONV = YesPlease
+ OLD_ICONV = UnfortunatelyYes
NO_STRLCPY = YesPlease
endif
ifeq ($(uname_S),SunOS)