summaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-09-01 16:39:13 +0300
committerGeorgi Kodinov <joro@sun.com>2009-09-01 16:39:13 +0300
commitc001f9cc16a345a08e51a4bf1a6b2642038aacfc (patch)
tree4199ad3d432cf9c03520cdc3592eb558c38cd6a7 /BUILD
parent8c7c09cc636a745fb88e00a5e0a2b2738ab5945e (diff)
downloadmariadb-git-c001f9cc16a345a08e51a4bf1a6b2642038aacfc.tar.gz
Fixed a problem in how BUILD/check_cpu handles Core 2 Duo processors.
This fixes the regression introduced in 5.1 that prevents 64 bit builds on Intel while still keeping the core2 hack operational so the cluster can build.
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 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"