diff options
| author | malff/marcsql@weblab.(none) <> | 2007-02-28 18:14:56 -0700 |
|---|---|---|
| committer | malff/marcsql@weblab.(none) <> | 2007-02-28 18:14:56 -0700 |
| commit | dc98aa82abeb14a491f05e583bd86110d319a10c (patch) | |
| tree | 5d5413ca065b58fc27c6a73c2eaf337f527295be /BUILD/SETUP.sh.rej | |
| parent | 8b07431927ccbdc0e0202396fbdd173933a9bf1d (diff) | |
| parent | 2baf35b4fab1cd1c185b7b98645eb76ed88d9f73 (diff) | |
| download | mariadb-git-dc98aa82abeb14a491f05e583bd86110d319a10c.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
Diffstat (limited to 'BUILD/SETUP.sh.rej')
| -rw-r--r-- | BUILD/SETUP.sh.rej | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/BUILD/SETUP.sh.rej b/BUILD/SETUP.sh.rej deleted file mode 100644 index ccbcaa4404f..00000000000 --- a/BUILD/SETUP.sh.rej +++ /dev/null @@ -1,19 +0,0 @@ -*************** -*** 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 |