diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-08-30 08:24:45 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-08-30 08:24:45 +0200 |
| commit | 72341d49edc8356269e64191ca6490ccea86873f (patch) | |
| tree | a94f552ecde9bec084b4f48b077a73216ea8f383 /BUILD | |
| parent | f63123f54b1e04b367bb4e4af1bdd1412579191a (diff) | |
| parent | 01ec88dcd8d49aede05ba1f22270708d132f3ffe (diff) | |
| download | mariadb-git-72341d49edc8356269e64191ca6490ccea86873f.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
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 dc894c91cbd..d12a690eaa8 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*) |