Bug 842131 - Use egrep to detect clang version, fixes build without GNU grep. r=glandium
authorLandry Breuil <landry@openbsd.org>
Mon, 18 Feb 2013 10:42:22 +0100
changeset 122223 b4a233c10cc9c24bd9370c517b393fe757d90de3
parent 122222 673dd484f5b5eaecbcb45e8da3d0a07ac82017b1
child 122224 8497cf15a6dcab190aa6f55d33389f672a0c6086
push id24327
push usergszorc@mozilla.com
push dateTue, 19 Feb 2013 05:22:32 +0000
treeherdermozilla-central@e8f8a3f6f1f6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs842131
milestone21.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 842131 - Use egrep to detect clang version, fixes build without GNU grep. r=glandium
build/autoconf/toolchain.m4
js/src/build/autoconf/toolchain.m4
--- a/build/autoconf/toolchain.m4
+++ b/build/autoconf/toolchain.m4
@@ -51,20 +51,20 @@ if test "$GXX" = yes; then
    if test "`$CXX -help 2>&1 | grep -c 'Intel(R) C++ Compiler'`" != "0"; then
      INTEL_CXX=1
    fi
 fi
 
 CLANG_CC=
 CLANG_CXX=
 if test "$GCC" = yes; then
-   if test "`$CC -v 2>&1 | grep -c 'clang version\|Apple.*clang'`" != "0"; then
+   if test "`$CC -v 2>&1 | egrep -c '(clang version|Apple.*clang)'`" != "0"; then
      CLANG_CC=1
    fi
 fi
 
 if test "$GXX" = yes; then
-   if test "`$CXX -v 2>&1 | grep -c 'clang version\|Apple.*clang'`" != "0"; then
+   if test "`$CXX -v 2>&1 | egrep -c '(clang version|Apple.*clang)'`" != "0"; then
      CLANG_CXX=1
    fi
 fi
 AC_SUBST(CLANG_CXX)
 ])
--- a/js/src/build/autoconf/toolchain.m4
+++ b/js/src/build/autoconf/toolchain.m4
@@ -51,20 +51,20 @@ if test "$GXX" = yes; then
    if test "`$CXX -help 2>&1 | grep -c 'Intel(R) C++ Compiler'`" != "0"; then
      INTEL_CXX=1
    fi
 fi
 
 CLANG_CC=
 CLANG_CXX=
 if test "$GCC" = yes; then
-   if test "`$CC -v 2>&1 | grep -c 'clang version\|Apple.*clang'`" != "0"; then
+   if test "`$CC -v 2>&1 | egrep -c '(clang version|Apple.*clang)'`" != "0"; then
      CLANG_CC=1
    fi
 fi
 
 if test "$GXX" = yes; then
-   if test "`$CXX -v 2>&1 | grep -c 'clang version\|Apple.*clang'`" != "0"; then
+   if test "`$CXX -v 2>&1 | egrep -c '(clang version|Apple.*clang)'`" != "0"; then
      CLANG_CXX=1
    fi
 fi
 AC_SUBST(CLANG_CXX)
 ])