summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-01 00:14:27 +0200
committerJunio C Hamano <gitster@pobox.com>2010-04-01 00:14:27 +0200
commit890a13a45285ad44858add2ce2f74eb478f549c8 (patch)
tree778d3d73aef0d238edd621eaaf38dcdb9f22616e /Makefile
parentMerge branch 'maint' (diff)
parentGit 1.7.0.4 (diff)
downloadgit-890a13a45285ad44858add2ce2f74eb478f549c8.tar.xz
git-890a13a45285ad44858add2ce2f74eb478f549c8.zip
Sync with 1.7.0.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 3a6c6ea525..8a0f5c4d5b 100644
--- a/Makefile
+++ b/Makefile
@@ -919,6 +919,7 @@ ifeq ($(uname_S),IRIX)
SNPRINTF_RETURNS_BOGUS = YesPlease
SHELL_PATH = /usr/gnu/bin/bash
NEEDS_LIBGEN = YesPlease
+ NEEDS_LIBICONV = YesPlease
endif
ifeq ($(uname_S),IRIX64)
NO_SETENV=YesPlease
@@ -937,6 +938,7 @@ ifeq ($(uname_S),IRIX64)
SNPRINTF_RETURNS_BOGUS = YesPlease
SHELL_PATH=/usr/gnu/bin/bash
NEEDS_LIBGEN = YesPlease
+ NEEDS_LIBICONV = YesPlease
endif
ifeq ($(uname_S),HP-UX)
NO_IPV6=YesPlease