diff options
| author | df@kahlann.erinye.com <> | 2006-12-20 17:43:45 +0100 |
|---|---|---|
| committer | df@kahlann.erinye.com <> | 2006-12-20 17:43:45 +0100 |
| commit | d629e41329f1a58a0e204abe07e3054e8ff23f80 (patch) | |
| tree | 6d900f0d6658034132dbfe3cb0d9c559327089d5 /BUILD | |
| parent | cf1fd5427c2a74ed84c2e697bbd1326085fe284d (diff) | |
| parent | 263876f373d14378b0c1629fc17c33d0bfbc09e2 (diff) | |
| download | mariadb-git-d629e41329f1a58a0e204abe07e3054e8ff23f80.tar.gz | |
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/check-cpu | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/BUILD/check-cpu b/BUILD/check-cpu index fb69fd0acae..5f90ae24881 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -5,9 +5,13 @@ # check_cpu () { - if test -r /proc/cpuinfo ; then + CPUINFO=/proc/cpuinfo + if test -n "$TEST_CPUINFO" ; then + CPUINFO=$TEST_CPUINFO + fi + if test -r "$CPUINFO" -a "$CPUINFO" != " " ; then # on Linux (and others?) we can get detailed CPU information out of /proc - cpuinfo="cat /proc/cpuinfo" + cpuinfo="cat $CPUINFO" # detect CPU family cpu_family=`$cpuinfo | grep 'family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1` @@ -33,6 +37,7 @@ check_cpu () { done else # Fallback when there is no /proc/cpuinfo + CPUINFO=" " case "`uname -s`" in FreeBSD|OpenBSD) cpu_family=`uname -m`; @@ -84,6 +89,18 @@ check_cpu () { *Pentium*M*pro*) cpu_arg="pentium-m"; ;; + *Celeron\(R\)*\ M*) + cpu_arg="pentium-m"; + ;; + *Celeron*Coppermine*) + cpu_arg="pentium3" + ;; + *Celeron\(R\)*) + cpu_arg="pentium4" + ;; + *Celeron*) + cpu_arg="pentium2"; + ;; *Athlon*64*) cpu_arg="athlon64"; ;; @@ -120,7 +137,14 @@ check_cpu () { esac - if test -z "$cpu_arg"; then + if test -z "$cpu_arg" ; then + if test "$CPUINFO" != " " ; then + # fallback to uname if necessary + TEST_CPUINFO=" " + check_cpu_cflags="" + check_cpu + return + fi echo "BUILD/check-cpu: Oops, could not find out what kind of cpu this machine is using." >&2 check_cpu_cflags="" return |