Bug 1188469 - remove configure.in workaround for broken egrep in OS X 10.7; r=mshal
authorNathan Froyd <froydnj@mozilla.com>
Tue, 28 Jul 2015 12:49:41 -0400
changeset 281520 07fc7b5295783a9cf45f44c825ae510b16c8cb74
parent 281519 bf7d6315fd6b616ebec2e0ae7febeeaf53168b4f
child 281521 88c12dfb0ea06970db3369e14477d01e60c89754
push id3885
push userbcampen@mozilla.com
push dateWed, 29 Jul 2015 18:32:33 +0000
reviewersmshal
bugs1188469
milestone42.0a1
Bug 1188469 - remove configure.in workaround for broken egrep in OS X 10.7; r=mshal Even if we used FIXED_EGREP at one point, we don't anymore.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -9208,32 +9208,16 @@ AC_SUBST(JS_SHARED_LIBRARY)
 MOZ_CREATE_CONFIG_STATUS()
 
 # No need to run subconfigures when building with LIBXUL_SDK_DIR
 if test "$COMPILE_ENVIRONMENT" -a -z "$LIBXUL_SDK_DIR"; then
   MOZ_SUBCONFIGURE_ICU()
   MOZ_SUBCONFIGURE_FFI()
 fi
 
-# Hack around an Apple bug that affects the egrep that comes with OS X 10.7.
-# "env ARCHPREFERENCE=i386,x86_64 arch egrep" first tries to use the 32-bit
-# Intel part of the egrep fat binary, even on 64-bit systems, and falls back on
-# the 64-bit part if it's not a fat binary, as can happen with MacPorts. We
-# (apparently) only need this hack when egrep's "pattern" is particularly long
-# (as in the following code) and the first egrep on our $PATH is Apple's.  See
-# bug 655339.
-case "$host" in
-*-apple-darwin11*)
-    FIXED_EGREP="env ARCHPREFERENCE=i386,x86_64 arch egrep"
-    ;;
-*)
-    FIXED_EGREP="egrep"
-    ;;
-esac
-
 # Run jemalloc configure script
 
 if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_MEMORY" && test -n "$MOZ_JEMALLOC3" -o -n "$MOZ_REPLACE_MALLOC"; then
   ac_configure_args="--build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_ --disable-valgrind"
   # We're using memalign for _aligned_malloc in memory/build/mozmemory_wrap.c
   # on Windows, so just export memalign on all platforms.
   ac_configure_args="$ac_configure_args ac_cv_func_memalign=yes"
   if test -n "$MOZ_REPLACE_MALLOC"; then