From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 May 2009 05:55:31 +0000 (-0700)
Subject: OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
X-Git-Tag: v1.6.4-rc0~95^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a0c0be97d492ea870cb8fb626eaca43b4d9cf34f;p=git.git

OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Makefile b/Makefile
index 26d180cc5..a23846b7c 100644
--- a/Makefile
+++ b/Makefile
@@ -698,7 +698,9 @@ ifeq ($(uname_S),SunOS)
 	NO_MEMMEM = YesPlease
 	NO_HSTRERROR = YesPlease
 	NO_MKDTEMP = YesPlease
-	OLD_ICONV = UnfortunatelyYes
+	ifneq ($(uname_R),5.11)
+		OLD_ICONV = UnfortunatelyYes
+	endif
 	ifeq ($(uname_R),5.8)
 		NO_UNSETENV = YesPlease
 		NO_SETENV = YesPlease