summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-23 05:55:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-23 05:55:31 (GMT)
commita0c0be97d492ea870cb8fb626eaca43b4d9cf34f (patch)
treefe41c1e6077bbf441e3cdceeed5c1c9e186e19f8 /Makefile
parent30d8080ca76432a60142f6af04e477bfa24b7f4c (diff)
downloadgit-a0c0be97d492ea870cb8fb626eaca43b4d9cf34f.zip
git-a0c0be97d492ea870cb8fb626eaca43b4d9cf34f.tar.gz
git-a0c0be97d492ea870cb8fb626eaca43b4d9cf34f.tar.bz2
OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 26d180c..a23846b 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