Bug 750574 - Only use "fixed" egrep command on OS X 10.7 [r=ted]
authorPaul O’Shannessy <paul@oshannessy.com>
Mon, 21 May 2012 12:42:56 -0700
changeset 98563 a0c0d4a72648e6031825ae8d1023e57b5cdec827
parent 98562 cd8973ac8ba6d4c51b4ec84331559f404d5867ed
child 98564 6f6115262c4bd3f179f3edae91feacf660fdcf30
push id1116
push userlsblakk@mozilla.com
push dateMon, 16 Jul 2012 19:38:18 +0000
treeherdermozilla-beta@95f959a8b4dc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs750574
milestone15.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 750574 - Only use "fixed" egrep command on OS X 10.7 [r=ted]
configure.in
--- a/configure.in
+++ b/configure.in
@@ -8835,21 +8835,21 @@ HAVE_WCRTOMB
 AC_CONFIG_HEADER(
 netwerk/necko-config.h
 xpcom/xpcom-config.h
 xpcom/xpcom-private.h
 )
 
 # Hack around an Apple bug that effects the egrep that comes with OS X 10.7.
 # "arch -arch i386 egrep" always uses the 32-bit Intel part of the egrep fat
-# binary, even on 64-bit systems.  It should work on OS X 10.4.5 and up.  We
-# (apparently) only need this hack when egrep's "pattern" is particularly
-# long (as in the following code).  See bug 655339.
+# binary, even on 64-bit systems. We (apparently) only need this hack when
+# egrep's "pattern" is particularly long (as in the following code).
+# See bug 655339.
 case "$host" in
-*-apple-darwin*)
+*-apple-darwin11*)
     FIXED_EGREP="arch -arch i386 egrep"
     ;;
 *)
     FIXED_EGREP="egrep"
     ;;
 esac
 
 # Save the defines header file before autoconf removes it.