diff options
| author | unknown <evgen@moonbone.local> | 2006-08-31 12:14:27 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-08-31 12:14:27 +0400 |
| commit | b128cfa8516900b882da6826dc6a5fb633fdd359 (patch) | |
| tree | 6976c755c17e28ab0b51cb2832a2add2725a9a66 /BUILD | |
| parent | 62accb04de076fd4aa841fd66ea59e9d34636e62 (diff) | |
| parent | 00c24198cb8929150636be82eb01aa806e26ab67 (diff) | |
| download | mariadb-git-b128cfa8516900b882da6826dc6a5fb633fdd359.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
sql/ha_innodb.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/check-cpu | 6 |
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*) |