diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-10-15 23:38:29 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-10-15 23:38:29 +0200 |
| commit | 6aad537a6aa1381b73e87e53a5a17eda4ef1d452 (patch) | |
| tree | 9366ff2dea102dc28d90ffad1cf8dff3039650e0 /BUILD | |
| parent | 8ea19fa73e86a3c27917a92affd6a9e43763c7ce (diff) | |
| parent | c7d32876f345785580a7cf286542ccf390b4e1fa (diff) | |
| download | mariadb-git-6aad537a6aa1381b73e87e53a5a17eda4ef1d452.tar.gz | |
Merge MySQL 5.1.39 into MariaDB 5.1.
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 9fa48adfb5f..c0e87a675cb 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -70,6 +70,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 ... @@ -134,10 +139,6 @@ check_cpu () { *i386*) cpu_arg="i386" ;; - #Core 2 Duo - *Intel*Core\(TM\)2*) - cpu_arg="nocona" - ;; # Intel ia64 *Itanium*) cpu_arg="itanium" |