diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-31 23:18:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-31 23:18:02 (GMT) |
| commit | 714cdcd03e2caac6e2dc8d94debc7c800742f546 (patch) | |
| tree | 12797b5947f811b1dfd96208bfc93207a0ac85e5 /Makefile | |
| parent | c6e73936b9ea26fcad0d77d68194545082343c43 (diff) | |
| parent | a0c0be97d492ea870cb8fb626eaca43b4d9cf34f (diff) | |
| download | git-714cdcd03e2caac6e2dc8d94debc7c800742f546.zip git-714cdcd03e2caac6e2dc8d94debc7c800742f546.tar.gz git-714cdcd03e2caac6e2dc8d94debc7c800742f546.tar.bz2 | |
Merge branch 'jc/solaris-0811'
* jc/solaris-0811:
OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 |