diff options
author | Alexander Nozdrin <alik@sun.com> | 2009-09-16 10:52:43 +0400 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2009-09-16 10:52:43 +0400 |
commit | 80c91e429876e66dfac0c288c8e390b553b5fb49 (patch) | |
tree | c54cce7e6f502a73331b395334f2ddd5b948280b /BUILD | |
parent | 4bf2c41df4ea0d62ce6b66da155988aafe2328ba (diff) | |
parent | 7ee331ab5d35e0d428cebf56a385627f2c65f76c (diff) | |
download | mariadb-git-80c91e429876e66dfac0c288c8e390b553b5fb49.tar.gz |
Merge from mysql-5.1-bugteam.
Diffstat (limited to 'BUILD')
-rwxr-xr-x | BUILD/check-cpu | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/BUILD/check-cpu b/BUILD/check-cpu index f73a872fecd..eb001ee61ae 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -73,6 +73,11 @@ check_cpu () { Alpha*EV6*) cpu_arg="ev6"; ;; + #Core 2 Duo + *Intel*Core\(TM\)2*) + cpu_arg="nocona" + core2="yes" + ;; # Intel ia32 *Intel*Core*|*X[eE][oO][nN]*) # a Xeon is just another pentium4 ... @@ -137,10 +142,6 @@ check_cpu () { *i386*) cpu_arg="i386" ;; - #Core 2 Duo - *Intel*Core\(TM\)2*) - cpu_arg="nocona" - ;; # Intel ia64 *Itanium*) cpu_arg="itanium" |