diff options
| author | monty@hundin.mysql.fi <> | 2001-10-30 16:31:35 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-10-30 16:31:35 +0200 |
| commit | 7367545cad47dc0bf7e8787c565c49235abbad15 (patch) | |
| tree | ae7c97d916cbedaec41df19869889814ef8f8688 /BUILD | |
| parent | 03bf236f4a70bf50158a186ffafd838a88823f1d (diff) | |
| download | mariadb-git-7367545cad47dc0bf7e8787c565c49235abbad15.tar.gz | |
Fix for gcc 3.0
Fix for using quoted table names with the SJIS character set.
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD/FINISH.sh | 2 | ||||
| -rw-r--r-- | BUILD/SETUP.sh | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 368ab339c2b..c7cd43fa64e 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -20,7 +20,7 @@ then (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) fi -CFLAGS=\"$cflags\" CXX=gcc CXXFLAGS=\"$cxxflags\" $configure" +CFLAGS=\"$cflags\" CXX=$CXX CXXFLAGS=\"$cxxflags\" $configure" if [ -z "$just_configure" ] then diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 778625e9e75..a8b0762c3ec 100644 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -40,7 +40,7 @@ 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="-mpentiumpro" +pentium_cflags="-mcpu=pentiumpro" sparc_cflags="" # be as fast as we can be without losing our ability to backtrace @@ -65,3 +65,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 |