Bug 476448 fix for Sun Studio Express r=jim
authorGinn Chen <ginn.chen@sun.com>
Wed, 18 Feb 2009 19:45:21 +0800
changeset 25126 09c2d14ec32477e843e4f86240b09867343e16ca
parent 25125 142c52f1c6506ecd9538512d49e2579a60e21e7f
child 25127 9c0be870182ffcbb08eb83768aedd2cd95494863
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjim
bugs476448
milestone1.9.2a1pre
Bug 476448 fix for Sun Studio Express r=jim
configure.in
js/src/configure.in
--- a/configure.in
+++ b/configure.in
@@ -1114,23 +1114,23 @@ cygwin*|mingw*|mks*|msvc*)
 linux*)
     HOST_OS_ARCH=Linux
     ;;
 solaris*)
     HOST_OS_ARCH=SunOS
     SOLARIS_SUNPRO_CC=
     SOLARIS_SUNPRO_CXX=
     if test -z "$GNU_CC"; then
-        if test "`$_SUBDIR_CC -V 2>&1 | grep -c 'Sun C '`" != "0"; then
+        if test "`$_SUBDIR_CC -V 2>&1 | egrep -c 'Sun.*C '`" != "0"; then
             SOLARIS_SUNPRO_CC=1
        fi
     fi
 
     if test -z "$GNU_CXX"; then
-       if test "`$_SUBDIR_CXX -V 2>&1 | grep -c 'Sun C++ '`" != "0"; then
+       if test "`$_SUBDIR_CXX -V 2>&1 | egrep -c 'Sun.*C\+\+ '`" != "0"; then
            SOLARIS_SUNPRO_CXX=1
        fi
     fi
     AC_SUBST(SOLARIS_SUNPRO_CC)
     AC_SUBST(SOLARIS_SUNPRO_CXX)
     ;;
 BSD_386)
     HOST_OS_ARCH=BSD
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1015,23 +1015,23 @@ cygwin*|mingw*|mks*|msvc*)
 linux*)
     HOST_OS_ARCH=Linux
     ;;
 solaris*)
     HOST_OS_ARCH=SunOS
     SOLARIS_SUNPRO_CC=
     SOLARIS_SUNPRO_CXX=
     if test -z "$GNU_CC"; then
-        if test "`$_SUBDIR_CC -V 2>&1 | grep -c 'Sun C '`" != "0"; then
+        if test "`$_SUBDIR_CC -V 2>&1 | egrep -c 'Sun.*C '`" != "0"; then
             SOLARIS_SUNPRO_CC=1
        fi
     fi
 
     if test -z "$GNU_CXX"; then
-       if test "`$_SUBDIR_CXX -V 2>&1 | grep -c 'Sun C++ '`" != "0"; then
+       if test "`$_SUBDIR_CXX -V 2>&1 | egrep -c 'Sun.*C\+\+ '`" != "0"; then
            SOLARIS_SUNPRO_CXX=1
        fi
     fi
     AC_SUBST(SOLARIS_SUNPRO_CC)
     AC_SUBST(SOLARIS_SUNPRO_CXX)
     ;;
 BSD_386)
     HOST_OS_ARCH=BSD