diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-04-27 12:56:01 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-04-27 12:56:01 +0200 |
| commit | 0e29519b2b4f06f2e37b59c7e9359331c15e83a4 (patch) | |
| tree | 922f8cbd12ff26fed829ed3fbe11e44e2ea2923f /BUILD/SETUP.sh | |
| parent | 49b448ae5a91ed9c0dde57ecd1de724bf517d904 (diff) | |
| parent | 78f89a729a962f7a88869a3d5e50ca493391b2a4 (diff) | |
| download | mariadb-git-0e29519b2b4f06f2e37b59c7e9359331c15e83a4.tar.gz | |
Merge from 4.1 to 5.0
client/mysql.cc:
Auto merged
include/my_pthread.h:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/examples/ha_archive.h:
Auto merged
BUILD/SETUP.sh:
Manual merge of conflicts
-DBIG_TABLES removed set by configure using --with-big-tables
configure.in:
manual merge
mysql-test/r/archive.result:
Manual merge
mysql-test/t/archive.test:
Manual merge
Diffstat (limited to 'BUILD/SETUP.sh')
| -rwxr-xr-x | BUILD/SETUP.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index f84dfd4b22d..a507d30e518 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -53,11 +53,14 @@ max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --wit max_no_es_configs="$max_leave_isam_configs --without-isam" max_configs="$max_no_es_configs --with-embedded-server" -alpha_cflags="-mcpu=ev6 -Wa,-mev6" # Not used yet -amd64_cflags="" # If dropping '--with-big-tables', add here "-DBIG_TABLES" -pentium_cflags="-mcpu=pentiumpro" -pentium64_cflags="-mcpu=nocona -m64" -ppc_cflags="-mpowerpc -mcpu=powerpc" +path=`dirname $0` +. "$path/check-cpu" + +alpha_cflags="$check_cpu_cflags -Wa,-m$cpu_flag" +amd64_cflags="$check_cpu_cflags" +pentium_cflags="$check_cpu_cflags" +pentium64_cflags="$check_cpu_cflags -m64" +ppc_cflags="$check_cpu_cflags" sparc_cflags="" # be as fast as we can be without losing our ability to backtrace |