diff options
| author | unknown <joerg@mysql.com> | 2005-05-26 12:51:44 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-05-26 12:51:44 +0200 |
| commit | 96f629db87b4c790f980dfeb539c8ddea0901354 (patch) | |
| tree | eaa4a697ce366f6da89001d3d3eaa62af2a7483b /BUILD | |
| parent | f0f9b5959eecb87b369fc45c981d926b79de0c61 (diff) | |
| parent | 7e5651ca17706473c3ea791db48a08c849181f1c (diff) | |
| download | mariadb-git-96f629db87b4c790f980dfeb539c8ddea0901354.tar.gz | |
Manual merge.
client/mysqldump.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/item.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
support-files/mysql.spec.sh:
Auto merged
client/client_priv.h:
Manual merge (still to be corrected!)
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/check-cpu | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/BUILD/check-cpu b/BUILD/check-cpu index 7619224314b..0283c669fb2 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -72,6 +72,7 @@ case "$cpu_family--$model_name" in ;; *ppc) cpu_flag="powerpc"; + no_march=1; ;; *) cpu_flag=""; @@ -106,6 +107,9 @@ case "$cc_ver--$cc_verno" in cpu_flag="$cpu_flag_old" fi check_cpu_cflags="-mcpu=$cpu_flag -march=$cpu_flag" + if test -n "$no_march"; then + check_cpu_cflags="-mcpu=$cpu_flag" + fi ;; *) check_cpu_cflags="" |