summaryrefslogtreecommitdiff
path: root/BUILD/SETUP.sh
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-10-30 16:31:35 +0200
committerunknown <monty@hundin.mysql.fi>2001-10-30 16:31:35 +0200
commit7b1cfb6353ee805326a22d8c9e71953b7ea8ed54 (patch)
treeae7c97d916cbedaec41df19869889814ef8f8688 /BUILD/SETUP.sh
parent859371bb5ffaf635d18552081a85c975278ab8e7 (diff)
downloadmariadb-git-7b1cfb6353ee805326a22d8c9e71953b7ea8ed54.tar.gz
Fix for gcc 3.0
Fix for using quoted table names with the SJIS character set. BUILD/FINISH.sh: Fix for gcc 3.0 BUILD/SETUP.sh: Fix for gcc 3.0 Docs/manual.texi: Changelog innobase/include/univ.i: Fix for gcc 3.0 sql/sql_lex.cc: Fix for using quoted table names with the SJIS character set.
Diffstat (limited to 'BUILD/SETUP.sh')
-rw-r--r--BUILD/SETUP.sh9
1 files changed, 8 insertions, 1 deletions
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