diff options
| author | monty@hundin.mysql.fi <> | 2001-11-04 16:14:09 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-11-04 16:14:09 +0200 |
| commit | fd0780493d9f91c1b4e8a0ff80fc670d5cf3b19a (patch) | |
| tree | 689c9d0271e23431f1ab0ac09e1af4d68a58ca76 /BUILD/SETUP.sh | |
| parent | 67951fdeb4195d6fcefeba6aab811b6c5e585178 (diff) | |
| parent | 65d4c846d83467270e56537b2cd0f44fc37ef9be (diff) | |
| download | mariadb-git-fd0780493d9f91c1b4e8a0ff80fc670d5cf3b19a.tar.gz | |
merge with 3.23.44
Diffstat (limited to 'BUILD/SETUP.sh')
| -rw-r--r-- | BUILD/SETUP.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index fdd0154fc99..f878123db59 100644 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -35,12 +35,12 @@ AM_MAKEFLAGS="-j 4" # -Wshadow -Wunused -Winline (The later isn't usable in C++ as # __attribute()__ doesn't work with gnu C++) global_warnings="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings" -debug_extra_warnings="-Wuninitialized" +#debug_extra_warnings="-Wuninitialized" c_warnings="$global_warnings -Wunused" cxx_warnings="$global_warnings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor" alpha_cflags="-mcpu=ev6 -Wa,-mev6" # Not used yet -pentium_cflags="" +pentium_cflags="-mcpu=pentiumpro" sparc_cflags="" # be as fast as we can be without losing our ability to backtrace @@ -48,7 +48,7 @@ fast_cflags="-O3 -fno-omit-frame-pointer" # this is one is for someone who thinks 1% speedup is worth not being # able to backtrace reckless_cflags="-O3 -fomit-frame-pointer " -debug_cflags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DSAFE_MUTEX -O2" +debug_cflags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DSAFE_MUTEX -O1" base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti" @@ -66,3 +66,10 @@ then else make=make fi + +if gcc -v 2>&1 | grep 'version 3' > /dev/null 2>&1 +then + CXX=c++ +else + CXX=gcc +fi |