diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 09:08:43 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 09:08:43 -0700 |
| commit | 027b5a4f3e7b7ba8b1f65050f05267c3273bc5f4 (patch) | |
| tree | 65068a9ad7f72cac2d0078ff03c0f8b8e2e4f507 | |
| parent | builtin-merge.c: allocate correct amount of memory (diff) | |
| parent | Makefile: do not set NEEDS_LIBICONV for Solaris 8 (diff) | |
| download | git-027b5a4f3e7b7ba8b1f65050f05267c3273bc5f4.tar.gz git-027b5a4f3e7b7ba8b1f65050f05267c3273bc5f4.zip | |
Merge branch 'jk/maint-soliconv' into maint
* jk/maint-soliconv:
Makefile: do not set NEEDS_LIBICONV for Solaris 8
| -rw-r--r-- | Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -639,7 +639,6 @@ ifeq ($(uname_S),SunOS) NO_MKDTEMP = YesPlease OLD_ICONV = UnfortunatelyYes ifeq ($(uname_R),5.8) - NEEDS_LIBICONV = YesPlease NO_UNSETENV = YesPlease NO_SETENV = YesPlease NO_C99_FORMAT = YesPlease |