summaryrefslogtreecommitdiff
path: root/BUILD/compile-dist
diff options
context:
space:
mode:
authorunknown <lars@mysql.com>2005-05-09 11:45:59 +0200
committerunknown <lars@mysql.com>2005-05-09 11:45:59 +0200
commit14b614e16414acc996a932c73f3d0a8e4e83538a (patch)
tree075608ca4d88921bffb8479717d99dadb29f3770 /BUILD/compile-dist
parent383c19a0442f914b18e5f146f5adfa78359ec5f2 (diff)
parent848611b5ed1e565d02eea896e22753b818c458c5 (diff)
downloadmariadb-git-14b614e16414acc996a932c73f3d0a8e4e83538a.tar.gz
Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1
BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged BUILD/FINISH.sh: Auto merged BUILD/compile-dist: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged storage/ndb/src/cw/cpcd/Process.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: Auto merged storage/ndb/src/kernel/error/ErrorReporter.cpp: Auto merged storage/ndb/src/ndbapi/Ndb.cpp: Auto merged
Diffstat (limited to 'BUILD/compile-dist')
-rwxr-xr-xBUILD/compile-dist5
1 files changed, 5 insertions, 0 deletions
diff --git a/BUILD/compile-dist b/BUILD/compile-dist
index 248f4bb04ce..a8d180eace1 100755
--- a/BUILD/compile-dist
+++ b/BUILD/compile-dist
@@ -18,12 +18,17 @@ autoconf
# Default to gcc for CC and CXX
if test -z "$CXX" ; then
export CXX=gcc
+ # Set some required compile options
+ if test -z "$CXXFLAGS" ; then
+ export CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti"
+ fi
fi
if test -z "$CC" ; then
export CC=gcc
fi
+
# Use ccache, if available
if ccache -V > /dev/null 2>&1
then