merged 5.0-bugteam->5.1-bugteam

1 files changed, 7 insertions, 2 deletions

diff --git a/BUILD/check-cpu b/BUILD/check-cpu
index 33bf857b845..9fa48adfb5f 100755
--- 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`;