summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <antony@ltantony.mysql.com>2005-05-08 01:57:13 +0100
committerunknown <antony@ltantony.mysql.com>2005-05-08 01:57:13 +0100
commite164f763bb8eb027c2f110963f78dea1dc978139 (patch)
treed1f26714a1ff57d2a8e5a41f32a78ad2b11fb5b6
parentd43410737b01c024afa1d5b44fa85846df42d080 (diff)
parentff7676c39a798b6454fe58406fc5a9dc6d62ca3b (diff)
downloadmariadb-git-e164f763bb8eb027c2f110963f78dea1dc978139.tar.gz
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0 BitKeeper/etc/logging_ok: auto-union
-rwxr-xr-xBUILD/check-cpu12
1 files changed, 12 insertions, 0 deletions
diff --git a/BUILD/check-cpu b/BUILD/check-cpu
index 553df39191f..ce106e5a603 100755
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@@ -19,6 +19,18 @@ if test -r /proc/cpuinfo ; then
if test -z "$model_name" ; then
model_name=`uname -m`
fi
+else
+ # Fallback when there is no /proc/cpuinfo
+ case "`uname -s`" in
+ FreeBSD)
+ cpu_family=`uname -m`;
+ model_name=`sysctl -b hw.model`
+ ;;
+ *)
+ cpu_family=`uname -m`;
+ model_name="unknown";
+ ;;
+ esac
fi
case "$cpu_family--$model_name" in