diff options
| author | evgen@moonbone.local <> | 2006-08-29 18:58:50 +0400 |
|---|---|---|
| committer | evgen@moonbone.local <> | 2006-08-29 18:58:50 +0400 |
| commit | 8cf97817173c080ec9399b306a9f5dbae96e5124 (patch) | |
| tree | 9d51093e989e3337f3ebf66b989e6da4245afb95 /BUILD/check-cpu | |
| parent | 002af6b5ea6e49e059bdc6e877f73e61912f16ea (diff) | |
| parent | 7a55f7fac4fbd465321b641a1a0dca088eb099ea (diff) | |
| download | mariadb-git-8cf97817173c080ec9399b306a9f5dbae96e5124.tar.gz | |
Merge moonbone.local:/work/tmp_merge-5.0-mysql
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
Diffstat (limited to 'BUILD/check-cpu')
| -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*) |