diff options
author | istruewing@chilla.local <> | 2007-01-29 18:47:46 +0100 |
---|---|---|
committer | istruewing@chilla.local <> | 2007-01-29 18:47:46 +0100 |
commit | 42bd03e2547d9f7739c754619b9cde10cb05d1b4 (patch) | |
tree | d5baa9f433ccab67349d65f3e71a37dfb9ef45b2 /BUILD | |
parent | 45f61a06fbad3e41efcd4cd950a068e967a70bd3 (diff) | |
parent | 79e099e8a6e0ffa055e75b738f1dc67689eb03d8 (diff) | |
download | mariadb-git-42bd03e2547d9f7739c754619b9cde10cb05d1b4.tar.gz |
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into chilla.local:/home/mydev/mysql-5.0-axmrg
Diffstat (limited to 'BUILD')
-rw-r--r-- | BUILD/SETUP.sh.rej | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/BUILD/SETUP.sh.rej b/BUILD/SETUP.sh.rej new file mode 100644 index 00000000000..ccbcaa4404f --- /dev/null +++ b/BUILD/SETUP.sh.rej @@ -0,0 +1,19 @@ +*************** +*** 39,46 **** + c_warnings="$global_warnings -Wunused" + cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor" + +! alpha_cflags="-mcpu=ev6 -Wa,-mev6" # Not used yet +! pentium_cflags="-mcpu=pentiumpro" + sparc_cflags="" + + # be as fast as we can be without losing our ability to backtrace +--- 39,46 ---- + c_warnings="$global_warnings -Wunused" + cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor" + +! #alpha_cflags="-mcpu=ev6 -Wa,-mev6" # Not used yet +! #pentium_cflags="-mcpu=pentiumpro" + sparc_cflags="" + + # be as fast as we can be without losing our ability to backtrace |