diff options
| author | unknown <monty@work.mysql.com> | 2001-05-31 12:56:05 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-05-31 12:56:05 +0200 |
| commit | e6ecbfd629bf92c84f270119405f4796464e7f4e (patch) | |
| tree | 7fc3c8f38fbab4a3cef1388c3bc2e53b0455c75c /BUILD | |
| parent | a14542a61fbaabf30a2735a74401e4cd2734314d (diff) | |
| parent | 8c8244918fc37bb25656a5f8b451a362e4b16577 (diff) | |
| download | mariadb-git-e6ecbfd629bf92c84f270119405f4796464e7f4e.tar.gz | |
merge
BitKeeper/triggers/post-commit:
Auto merged
acinclude.m4:
Auto merged
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_table.cc:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD/FINISH.sh | 4 | ||||
| -rw-r--r-- | BUILD/SETUP.sh | 5 | ||||
| -rwxr-xr-x | BUILD/compile-pentium | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 4f13f5f8e4d..368ab339c2b 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -15,6 +15,10 @@ $make -k clean || true aclocal && autoheader && aclocal && automake && autoconf (cd bdb/dist && sh s_all) (cd innobase && aclocal && autoheader && aclocal && automake && autoconf) +if [ -d gemini ] +then + (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) +fi CFLAGS=\"$cflags\" CXX=gcc CXXFLAGS=\"$cxxflags\" $configure" diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 1f45c5c18cb..778625e9e75 100644 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -43,8 +43,11 @@ alpha_cflags="-mcpu=ev6 -Wa,-mev6" # Not used yet pentium_cflags="-mpentiumpro" sparc_cflags="" +# be as fast as we can be without losing our ability to backtrace fast_cflags="-O3 -fno-omit-frame-pointer" -reckless_cflags="-O3 -fomit-frame-pointer -ffixed-ebp" +# 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" base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti" diff --git a/BUILD/compile-pentium b/BUILD/compile-pentium index 9607ca03e7e..11559be93de 100755 --- a/BUILD/compile-pentium +++ b/BUILD/compile-pentium @@ -3,7 +3,7 @@ path=`dirname $0` . "$path/SETUP.sh" -extra_flags="$pentium_cflags $reckless_cflags" +extra_flags="$pentium_cflags $fast_cflags" extra_configs="$pentium_configs" strip=yes |