Commit c446ade8 authored by Alexey Kopytov's avatar Alexey Kopytov

Automerge.

parents a48020ac 67996ebc
...@@ -1624,7 +1624,7 @@ esac ...@@ -1624,7 +1624,7 @@ esac
# Build optimized or debug version ? # Build optimized or debug version ?
# First check for gcc and g++ # First check for gcc and g++
if test "$ac_cv_prog_gcc" = "yes" if test "$GCC" = "yes"
then then
DEBUG_CFLAGS="-g" DEBUG_CFLAGS="-g"
DEBUG_OPTIMIZE_CC="-O" DEBUG_OPTIMIZE_CC="-O"
...@@ -1632,9 +1632,16 @@ then ...@@ -1632,9 +1632,16 @@ then
else else
DEBUG_CFLAGS="-g" DEBUG_CFLAGS="-g"
DEBUG_OPTIMIZE_CC="" DEBUG_OPTIMIZE_CC=""
case $SYSTEM_TYPE in
*solaris*)
OPTIMIZE_CFLAGS="-O1"
;;
*)
OPTIMIZE_CFLAGS="-O" OPTIMIZE_CFLAGS="-O"
;;
esac
fi fi
if test "$ac_cv_prog_cxx_g" = "yes" if test "$GXX" = "yes"
then then
DEBUG_CXXFLAGS="-g" DEBUG_CXXFLAGS="-g"
DEBUG_OPTIMIZE_CXX="-O" DEBUG_OPTIMIZE_CXX="-O"
...@@ -1642,7 +1649,14 @@ then ...@@ -1642,7 +1649,14 @@ then
else else
DEBUG_CXXFLAGS="-g" DEBUG_CXXFLAGS="-g"
DEBUG_OPTIMIZE_CXX="" DEBUG_OPTIMIZE_CXX=""
case $SYSTEM_TYPE in
*solaris*)
OPTIMIZE_CXXFLAGS="-O1"
;;
*)
OPTIMIZE_CXXFLAGS="-O" OPTIMIZE_CXXFLAGS="-O"
;;
esac
fi fi
case $SYSTEM_TYPE in case $SYSTEM_TYPE in
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment