summaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-09-16 10:52:43 +0400
committerAlexander Nozdrin <alik@sun.com>2009-09-16 10:52:43 +0400
commitdf0dcab43744c3c78beddaa2fcd9a87a7abe1022 (patch)
treec54cce7e6f502a73331b395334f2ddd5b948280b /BUILD
parent6fbb712fed26516a3152028e71125bf147bcb8a8 (diff)
parent16d8401a2897258c94bb741110c59e534d2d637c (diff)
downloadmariadb-git-df0dcab43744c3c78beddaa2fcd9a87a7abe1022.tar.gz
Merge from mysql-5.1-bugteam.
Diffstat (limited to 'BUILD')
-rwxr-xr-xBUILD/check-cpu9
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"