* configure.in (BUILD_PREFIX, BUILD_PREFIX_1): Set if enable

	coverage is on.
	* configure: Regenerated.
	* Makefile.in (ALL_CFLAGS): Correct its comment.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@69136 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e5cf6bb..d19961d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-09  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * configure.in (BUILD_PREFIX, BUILD_PREFIX_1): Set if enable
+       coverage is on.
+       * configure: Regenerated.
+       * Makefile.in (ALL_CFLAGS): Correct its comment.
+
 2003-07-08  Mark Mitchell  <mark@codesourcery.com>
 
        * fold-const.c (make_range): Do not access operand 1 for a

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index ff2b409..a0003cb 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -668,9 +668,8 @@ CPPLIB_H = cpplib.h line-map.h
 # autoconf inserts -DCROSS_COMPILE if we are building a cross compiler.
 INTERNAL_CFLAGS = -DIN_GCC @CROSS@
 
-# This is the variable actually used when we compile.
-# If you change this line, you probably also need to change the definition
-# of BUILD_CFLAGS in build-make to match.
+# This is the variable actually used when we compile. If you change this,
+# you probably want to update BUILD_CFLAGS in configure.in
 ALL_CFLAGS = $(X_CFLAGS) $(T_CFLAGS) \
   $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) $(XCFLAGS) @DEFS@
 

diff --git a/gcc/configure b/gcc/configure
index 257d16f..798361b 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -5679,8 +5679,8 @@ BUILD_CFLAGS='$(ALL_CFLAGS)'
 STMP_FIXINC=stmp-fixinc                
 STMP_FIXPROTO=stmp-fixproto    
 
-# And these apply if build != host.
-if test x$build != x$host
+# And these apply if build != host, or we are generating coverage data
+if test x$build != x$host || test "x$coverage_flags" != x
 then
     BUILD_PREFIX=build-
     BUILD_PREFIX_1=build-

diff --git a/gcc/configure.in b/gcc/configure.in
index 080850d..16bd3ea 100644 (file)
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -1413,8 +1413,8 @@ BUILD_CFLAGS='$(ALL_CFLAGS)'      AC_SUBST(BUILD_CFLAGS)
 STMP_FIXINC=stmp-fixinc                AC_SUBST(STMP_FIXINC)
 STMP_FIXPROTO=stmp-fixproto    AC_SUBST(STMP_FIXPROTO)
 
-# And these apply if build != host.
-if test x$build != x$host
+# And these apply if build != host, or we are generating coverage data
+if test x$build != x$host || test "x$coverage_flags" != x
 then
     BUILD_PREFIX=build-
     BUILD_PREFIX_1=build-