aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-10-09 09:08:43 -0700
committerShawn O. Pearce <spearce@spearce.org>2008-10-09 09:08:43 -0700
commit027b5a4f3e7b7ba8b1f65050f05267c3273bc5f4 (patch)
tree65068a9ad7f72cac2d0078ff03c0f8b8e2e4f507
parent36e40535dcafe230a7f5ef43fea5cf67c1c58f6f (diff)
parent0e214af9c34623979b19bb183bd8e518d749fd63 (diff)
downloadgit-027b5a4f3e7b7ba8b1f65050f05267c3273bc5f4.tar.gz
git-027b5a4f3e7b7ba8b1f65050f05267c3273bc5f4.tar.xz
Merge branch 'jk/maint-soliconv' into maint
* jk/maint-soliconv: Makefile: do not set NEEDS_LIBICONV for Solaris 8
-rw-r--r--Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 7fad9f7ff..0d40f0ecc 100644
--- a/Makefile
+++ b/Makefile
@@ -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