diff options
author | istruewing@stella.local <> | 2008-03-14 12:02:11 +0100 |
---|---|---|
committer | istruewing@stella.local <> | 2008-03-14 12:02:11 +0100 |
commit | eabe082d6fdf70dc15babb9cda6c01035594ae70 (patch) | |
tree | b52789d6b0503cf1a56ee2fea977be99a7287207 /BUILD | |
parent | df059d9ca678a6f8ad20960c241608870fdcd337 (diff) | |
parent | eac3a26efab4f3886ba68ed24cc1ddfc453dfa0e (diff) | |
download | mariadb-git-eabe082d6fdf70dc15babb9cda6c01035594ae70.tar.gz |
Manual merge
Diffstat (limited to 'BUILD')
-rwxr-xr-x | BUILD/SETUP.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index e940f7a3371..ef8aefca710 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -100,8 +100,10 @@ if [ "x$warning_mode" != "xpedantic" ]; then # C warnings c_warnings="$warnings -Wunused-parameter" # C++ warnings - cxx_warnings="$warnings -Woverloaded-virtual -Wsign-promo -Wreorder" - cxx_warnings="$warnings -Wctor-dtor-privacy -Wnon-virtual-dtor" + cxx_warnings="$warnings" +# cxx_warnings="$cxx_warnings -Woverloaded-virtual -Wsign-promo" + cxx_warnings="$cxx_warnings -Wreorder" + cxx_warnings="$cxx_warnings -Wctor-dtor-privacy -Wnon-virtual-dtor" # Added unless --with-debug=full debug_extra_cflags="-O1 -Wuninitialized" else |