aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-07-23 22:30:07 -0700
committerJunio C Hamano <gitster@pobox.com>2009-07-24 09:20:34 -0700
commit01ae841ccf3aa5d5331a4e6aed6122fee6617740 (patch)
tree14bacbc8714b0c09654f777d46395b7b86089d9d
parent96d69b554325b6caa323428e64fba62ca033310d (diff)
downloadgit-01ae841ccf3aa5d5331a4e6aed6122fee6617740.tar.gz
git-01ae841ccf3aa5d5331a4e6aed6122fee6617740.tar.xz
SunOS grep does not understand -C<n> nor -e
The first "grep -C1" test in t7002 does not pass on my SunOS-5.11-i86pc, and that is not because our way to spawn external grep is broken, but because the native grep does not understand -C<n>. It turns out that Peff was also using this option himself because our Makefile doesn't do that automatically. Brandon Casey uses SUNWspro compiler without having to set this, and it turns out that the compiler does not define preprocessor macro __unix__ which made him always use the built-in grep, never an external one. Let's be more explicit and say that we do not use external grep on Suns. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index c6b81d012..f88ed3e14 100644
--- a/Makefile
+++ b/Makefile
@@ -702,6 +702,7 @@ ifeq ($(uname_S),SunOS)
NO_HSTRERROR = YesPlease
NO_MKDTEMP = YesPlease
OLD_ICONV = UnfortunatelyYes
+ NO_EXTERNAL_GREP = YesPlease
ifeq ($(uname_R),5.8)
NO_UNSETENV = YesPlease
NO_SETENV = YesPlease