Commit c001f9cc authored by Georgi Kodinov's avatar Georgi Kodinov

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.
parent 8c7c09cc
...@@ -70,6 +70,11 @@ check_cpu () { ...@@ -70,6 +70,11 @@ check_cpu () {
Alpha*EV6*) Alpha*EV6*)
cpu_arg="ev6"; cpu_arg="ev6";
;; ;;
#Core 2 Duo
*Intel*Core\(TM\)2*)
cpu_arg="nocona"
core2="yes"
;;
# Intel ia32 # Intel ia32
*Intel*Core*|*X[eE][oO][nN]*) *Intel*Core*|*X[eE][oO][nN]*)
# a Xeon is just another pentium4 ... # a Xeon is just another pentium4 ...
...@@ -134,10 +139,6 @@ check_cpu () { ...@@ -134,10 +139,6 @@ check_cpu () {
*i386*) *i386*)
cpu_arg="i386" cpu_arg="i386"
;; ;;
#Core 2 Duo
*Intel*Core\(TM\)2*)
cpu_arg="nocona"
;;
# Intel ia64 # Intel ia64
*Itanium*) *Itanium*)
cpu_arg="itanium" cpu_arg="itanium"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment