diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-11-06 18:22:32 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-11-06 18:22:32 +0100 |
| commit | ad368a2b54f4177daf5abd17fa7533f1626f6feb (patch) | |
| tree | c762060dc3c06f7b35460ef22fecc08cf8adee55 /BUILD | |
| parent | 716c09936365c9cfeb2304ca54ffdd95c1031c6e (diff) | |
| parent | a6793a48e20c2aebb1391e2f4f916cf147ff1900 (diff) | |
| download | mariadb-git-ad368a2b54f4177daf5abd17fa7533f1626f6feb.tar.gz | |
Merge Mysql 5.1.39 merge into MariaDB trunk
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" |