diff options
| author | unknown <tsmith@maint2.mysql.com> | 2006-08-31 00:01:43 +0200 |
|---|---|---|
| committer | unknown <tsmith@maint2.mysql.com> | 2006-08-31 00:01:43 +0200 |
| commit | 5373a7ec0a8767211c0db9baf28917ba1d485651 (patch) | |
| tree | 22896f7dd3be3e2ae695d66895948bba62bb683a /BUILD | |
| parent | c57a76ce7555d58540d33ab15c512980a71bbf34 (diff) | |
| parent | 3f4964394c0f3bb75a4c02549b70b728aa1ddd90 (diff) | |
| download | mariadb-git-5373a7ec0a8767211c0db9baf28917ba1d485651.tar.gz | |
Merge maint2.mysql.com:/data/localhome/tsmith/bk/g50
into maint2.mysql.com:/data/localhome/tsmith/bk/50
sql-common/client.c:
Auto merged
sql/item_func.h:
Auto merged
BUILD/check-cpu:
Manual merge
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 df44c3f55ea..fb69fd0acae 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -93,6 +93,10 @@ check_cpu () { *Opteron*) cpu_arg="opteron"; ;; + # MacOSX / Intel + *i386*i486*) + cpu_arg="pentium-m"; + ;; # Intel ia64 *Itanium*) @@ -131,7 +135,7 @@ check_cpu () { 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*) |