diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-06-26 17:59:52 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-06-26 17:59:52 +0400 |
| commit | c446ade8e5196e10451440ae84957c8e9b8b6ee9 (patch) | |
| tree | cca4467afafba9baa0b7fc3f344bb9e0fb166679 /configure.in | |
| parent | a48020acbe7126a6d4cfa267f9a4e84b62a7e402 (diff) | |
| parent | 67996ebc08f129710260ccc48c08d5671f55b985 (diff) | |
| download | mariadb-git-c446ade8e5196e10451440ae84957c8e9b8b6ee9.tar.gz | |
Automerge.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/configure.in b/configure.in index d75a15681ff..18adbabcee4 100644 --- a/configure.in +++ b/configure.in @@ -1624,7 +1624,7 @@ esac # Build optimized or debug version ? # First check for gcc and g++ -if test "$ac_cv_prog_gcc" = "yes" +if test "$GCC" = "yes" then DEBUG_CFLAGS="-g" DEBUG_OPTIMIZE_CC="-O" @@ -1632,9 +1632,16 @@ then else DEBUG_CFLAGS="-g" DEBUG_OPTIMIZE_CC="" - OPTIMIZE_CFLAGS="-O" + case $SYSTEM_TYPE in + *solaris*) + OPTIMIZE_CFLAGS="-O1" + ;; + *) + OPTIMIZE_CFLAGS="-O" + ;; + esac fi -if test "$ac_cv_prog_cxx_g" = "yes" +if test "$GXX" = "yes" then DEBUG_CXXFLAGS="-g" DEBUG_OPTIMIZE_CXX="-O" @@ -1642,7 +1649,14 @@ then else DEBUG_CXXFLAGS="-g" DEBUG_OPTIMIZE_CXX="" - OPTIMIZE_CXXFLAGS="-O" + case $SYSTEM_TYPE in + *solaris*) + OPTIMIZE_CXXFLAGS="-O1" + ;; + *) + OPTIMIZE_CXXFLAGS="-O" + ;; + esac fi case $SYSTEM_TYPE in |