Commit 22485f4a authored by unknown's avatar unknown
Browse files

Merge moonbone.local:/work/tmp_merge-5.0-mysql 

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
parents 6071b686 4a8c861c

BUILD/check-cpu

+5 −1
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ case "$cpu_family--$model_name" in 
  *Opteron*)

    cpu_arg="opteron";

    ;;

  # MacOSX / Intel  

  *i386*i486*)

    cpu_arg="pentium-m";

    ;;



  # Intel ia64

  *Itanium*)
@@ -131,7 +135,7 @@ else 
fi



cc_ver=`$cc --version | sed 1q`

cc_verno=`echo $cc_ver | sed -e 's/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`

cc_verno=`echo $cc_ver | sed -e 's/^.*gcc/gcc/g; s/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`



case "$cc_ver--$cc_verno" in

  *GCC*)