Fixed bug in check-cpu script for SPARC and Solaris

Changed defaults on Solaris and Forte to be CC and cc instead of cc-5.0

BUILD/build_mccge.sh

@@ -1202,10 +1202,10 @@ set_cc_and_cxx_for_icc()
 set_cc_and_cxx_for_forte()
 {
   if test "x$CC" = "x" ; then
-    CC="cc-5.0"
+    CC="cc"
   fi
   if test "x$CXX" = "x" ; then
-    CXX="cc-5.0"
+    CXX="CC"
   fi
 }
 

BUILD/check-cpu

@@ -54,8 +54,8 @@ check_cpu () {
         model_name=`machine`
         ;;
       *)
-        cpu_family=`uname -m`;
-        model_name=`uname -p`;
+        cpu_family=`uname -p`;
+        model_name=`uname -m`;
         ;;
     esac
   fi
@@ -144,7 +144,7 @@ check_cpu () {
       cpu_arg="itanium"
       ;;
     # Solaris Sparc
-    *sparc*sun4u*)
+    *sparc*sun4[uv]*)
       cpu_arg="sparc"
       ;;
     # Power PC