Merge branch 'jc/solaris-0811'

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index ab6f6e14ebba10641348c3562094ac27032caf87..0ab1cff30de7b3cc745ce79acca4a3f7cfbd1977 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -702,7 +702,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