From f71cd38ac42420fc0c7290e0adedf965749d74df Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Tue, 29 Jun 2010 22:51:07 -0700 Subject: [PATCH] Fix CFLAGS for non-GCC compilers. * configure.in (CFLAGS): Always use -g like it was done before the 2010-03-30 change. (REAL_CFLAGS): Use CFLAGS for non-GCC to get optimization flags. (Bug#6538) --- ChangeLog | 7 +++++++ configure | 11 ++++------- configure.in | 12 ++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6564b91604..704647f3bc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-06-30 Dan Nicolaescu + + Fix CFLAGS for non-GCC compilers. + * configure.in (CFLAGS): Always use -g like it was done before the + 2010-03-30 change. + (REAL_CFLAGS): Use CFLAGS for non-GCC to get optimization flags. (Bug#6538) + 2010-06-30 Glenn Morris * configure.in (HAVE_SOUND, HAVE_X_I18N, HAVE_X11R6_XIM): diff --git a/configure b/configure index 90718cf6aad..cb353569d78 100755 --- a/configure +++ b/configure @@ -5436,21 +5436,18 @@ CPP=`eval "echo $CPP"` ### First figure out CFLAGS (which we use for running the compiler here) ### and REAL_CFLAGS (which we use for real compilation). -### The two are the same except on a few systems, where they are made -### different to work around various lossages. For example, -### GCC 2.5 on GNU/Linux needs them to be different because it treats -g -### as implying static linking. +### The two are the same except when using GCC where we might use +### extra warning and profiling flags. ### If the CFLAGS env var is specified, we use that value ### instead of the default. if test "x$SPECIFIED_CFLAGS" = x; then + CFLAGS="-g $C_OPTIMIZE_SWITCH" if test x$GCC = xyes; then - CFLAGS="-g $C_OPTIMIZE_SWITCH" REAL_CFLAGS="$CFLAGS $C_WARNINGS_SWITCH $PROFILING_CFLAGS" else - CFLAGS= - REAL_CFLAGS= + REAL_CFLAGS="$CFLAGS" fi else REAL_CFLAGS="$CFLAGS" diff --git a/configure.in b/configure.in index bb2866b6654..805ea9c4134 100644 --- a/configure.in +++ b/configure.in @@ -847,23 +847,19 @@ CPP=`eval "echo $CPP"` ### First figure out CFLAGS (which we use for running the compiler here) ### and REAL_CFLAGS (which we use for real compilation). -### The two are the same except on a few systems, where they are made -### different to work around various lossages. For example, -### GCC 2.5 on GNU/Linux needs them to be different because it treats -g -### as implying static linking. +### The two are the same except when using GCC where we might use +### extra warning and profiling flags. ### If the CFLAGS env var is specified, we use that value ### instead of the default. -dnl C_OPTIMIZE_SWITCH unused save for gcc, so why set it for non-gcc? dnl Note AC_PROG_CC sets CFLAGS to -g -O2 for gcc anyway. if test "x$SPECIFIED_CFLAGS" = x; then + CFLAGS="-g $C_OPTIMIZE_SWITCH" if test x$GCC = xyes; then - CFLAGS="-g $C_OPTIMIZE_SWITCH" REAL_CFLAGS="$CFLAGS $C_WARNINGS_SWITCH $PROFILING_CFLAGS" else - CFLAGS= - REAL_CFLAGS= + REAL_CFLAGS="$CFLAGS" fi else REAL_CFLAGS="$CFLAGS" -- 2.39.2