diff options
| author | jimw@mysql.com <> | 2005-05-09 06:33:20 -0700 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-05-09 06:33:20 -0700 |
| commit | fee81b6d970025b1acb6ce328f8181ec6d4f5b55 (patch) | |
| tree | f0744307aed87be22a5d8cd5b4ae40fd9cc665cf | |
| parent | 3591b938748c7e54f57d97bc66d75f3d6c04f439 (diff) | |
| parent | 82e6d15be58754aa4635ffddc550d76628c00266 (diff) | |
| download | mariadb-git-fee81b6d970025b1acb6ce328f8181ec6d4f5b55.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
| -rwxr-xr-x | BUILD/check-cpu | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/BUILD/check-cpu b/BUILD/check-cpu index d50a83a5475..dfdf96d6b29 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -34,7 +34,7 @@ else fi cpu_flag="" -cpu_flag_obs="" +cpu_flag_old="" case "$cpu_family--$model_name" in Alpha*EV6*) @@ -57,7 +57,7 @@ case "$cpu_family--$model_name" in ;; *Athlon*64*) cpu_flag="athlon64"; - cpu_flag_obs="athlon"; + cpu_flag_old="athlon"; ;; *Athlon*) cpu_flag="athlon"; @@ -98,8 +98,9 @@ case "$cc_ver--$cc_verno" in ;; *GCC*) # Fix for older compiler versions - if test -z "$cpu_flag_obs"; then - cpu_flag=$cpu_flag_obs; + if test -n "$cpu_flag_old"; then + cpu_flag="$cpu_flag_old" + fi check_cpu_cflags="-mcpu=$cpu_flag -march=$cpu_flag" ;; *) |