merged 5.0-bugteam->5.1-bugteam

17 years ago · 2b4ec29274
1 changed files with 7 additions and 2 deletions
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@ -47,8 +47,13 @@ check_cpu () {
        model_name=`sysctl -n hw.model`
        ;;
      Darwin)
-        cpu_family=`uname -p`
-        model_name=`machine`
+        cpu_family=`sysctl -n machdep.cpu.vendor`
+        model_name=`sysctl -n machdep.cpu.brand_string`
+        if [ -z "$cpu_family" -o -z "$model_name" ]
+        then  
+          cpu_family=`uname -p`
+          model_name=`machine`
+        fi  
        ;;
      *)
        cpu_family=`uname -m`;