Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test if CXXFLAGS/CFLAGS contains the -g or the -O options before adding our -g and -O2 flags: this avoids duplicates in the GCC command line which just generate confusion

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-02-18 11:05:38 +00:00
parent de0573dabb
commit 6ad6ba217a
2 changed files with 62 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 58743 2009-02-08 00:47:04Z FM .
# From configure.in Id: configure.in 58765 2009-02-08 15:38:30Z FM .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
#
@@ -41415,7 +41415,10 @@ _ACEOF
fi
DEBUG_CFLAGS=
if test "$wxUSE_DEBUG_INFO" = "yes" ; then
if `echo $CXXFLAGS $CFLAGS | grep " -g" >/dev/null`; then
{ echo "$as_me:$LINENO: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&5
echo "$as_me: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&2;}
elif test "$wxUSE_DEBUG_INFO" = "yes" ; then
DEBUG_CFLAGS="-g"
fi
@@ -41487,6 +41490,10 @@ if test "$GCC" = "yes" ; then
fi
OPTIMISE_CFLAGS=
if `echo $CXXFLAGS $CFLAGS | grep " -O" >/dev/null`; then
{ echo "$as_me:$LINENO: WARNING: CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option" >&5
echo "$as_me: WARNING: CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option" >&2;}
else
if test "$wxUSE_OPTIMISE" = "no" ; then
if test "$GCC" = yes ; then
OPTIMISE_CFLAGS="-O0"
@@ -41505,6 +41512,7 @@ else
OPTIMISE_CFLAGS="-O"
fi
fi
fi
if test "x$WXWIN_COMPATIBILITY_2_6" = "xyes"; then

20
configure.in
View File

@@ -624,7 +624,7 @@ if test "$USE_OS2" = 1; then
WX_ARG_ENABLE(omf, [ --enable-omf use OMF object format], wxUSE_OMF)
fi
dnl --enablle-debug is equivalent to both --enable-debug_flag and
dnl --enable-debug is equivalent to both --enable-debug_flag and
dnl --enable-debug_info
if test "$wxUSE_DEBUG" = "yes"; then
DEFAULT_wxUSE_DEBUG_FLAG=yes
@@ -1012,7 +1012,7 @@ dnl defines CFLAGS
dnl
dnl this magic incantation is needed to prevent AC_PROG_CC from setting the
dnl default CFLAGS (something like "-g -O2") -- we don't need this as we add
dnl -g and -O flags ourselves below
dnl (if not already present in C*FLAGS) the -g and -O flags ourselves below
CFLAGS=${CFLAGS:=}
AC_BAKEFILE_PROG_CC
@@ -5139,7 +5139,13 @@ fi
dnl DEBUG_CFLAGS contains debugging options (supposed to be the same for C and C++
dnl compilers: we'd need a separate DEBUG_CXXFLAGS if this is ever not the case)
DEBUG_CFLAGS=
if test "$wxUSE_DEBUG_INFO" = "yes" ; then
if `echo $CXXFLAGS $CFLAGS | grep " -g" >/dev/null`; then
dnl the CXXFLAGS or the CFLAGS variable already contains the -g flag
dnl (e.g. it was specified by the user before running configure); since
dnl later they will be merged with DEBUG_CFLAGS, don't set the -g option
dnl in DEBUG_CFLAGS to avoid (possibly different) flag duplicates
AC_MSG_WARN([CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option])
elif test "$wxUSE_DEBUG_INFO" = "yes" ; then
DEBUG_CFLAGS="-g"
fi
@@ -5212,6 +5218,13 @@ fi
dnl C/C++ compiler option for optimization (supposed to be the same for both)
OPTIMISE_CFLAGS=
if `echo $CXXFLAGS $CFLAGS | grep " -O" >/dev/null`; then
dnl the CXXFLAGS or the CFLAGS variable already contains -O optimization flag
dnl (e.g. it was specified by the user before running configure); since
dnl later they will be merged with OPTIMISE_CFLAGS, don't set the -O option
dnl in OPTIMISE_CFLAGS to avoid (possibly different) flag duplicates
AC_MSG_WARN([CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option])
else
if test "$wxUSE_OPTIMISE" = "no" ; then
if test "$GCC" = yes ; then
dnl use -O0 because compiling with it is faster than compiling with no
@@ -5237,6 +5250,7 @@ else
OPTIMISE_CFLAGS="-O"
fi
fi
fi
dnl ---------------------------------------------------------------------------
dnl compatibility level