From: Junio C Hamano Date: Fri, 24 Jul 2009 05:30:07 +0000 (-0700) Subject: SunOS grep does not understand -C nor -e X-Git-Tag: v1.6.4-rc3~5^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=01ae841ccf3aa5d5331a4e6aed6122fee6617740;p=git.git SunOS grep does not understand -C 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. 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 --- 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