summaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authorevgen@moonbone.local <>2006-09-01 14:08:38 +0400
committerevgen@moonbone.local <>2006-09-01 14:08:38 +0400
commite1c245bff39ea9c67cf16ba4fea6fe1d2f0c38dc (patch)
treea39c7842d908256f7192d59cbff602e87e10ec85 /BUILD
parent636d9023058093d4964ceb3c50efd8e4b816b073 (diff)
parent94028c618f7f7df2736851b6f4faa131708016d9 (diff)
downloadmariadb-git-e1c245bff39ea9c67cf16ba4fea6fe1d2f0c38dc.tar.gz
Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt
into moonbone.local:/work/tmp_merge-5.1-mysql
Diffstat (limited to 'BUILD')
-rwxr-xr-xBUILD/check-cpu6
1 files changed, 5 insertions, 1 deletions
diff --git a/BUILD/check-cpu b/BUILD/check-cpu
index 583e31ee389..2543b540d2a 100755
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@@ -93,6 +93,10 @@ case "$cpu_family--$model_name" in
*Opteron*)
cpu_arg="opteron";
;;
+ # MacOSX / Intel
+ *i386*i486*)
+ cpu_arg="pentium-m";
+ ;;
# Intel ia64
*Itanium*)
@@ -131,7 +135,7 @@ else
fi
cc_ver=`$cc --version | sed 1q`
-cc_verno=`echo $cc_ver | sed -e 's/[^0-9. ]//g; s/^ *//g; s/ .*//g'`
+cc_verno=`echo $cc_ver | sed -e 's/^.*gcc/gcc/g; s/[^0-9. ]//g; s/^ *//g; s/ .*//g'`
case "$cc_ver--$cc_verno" in
*GCC*)