* configure.ac (BUILD_CXXFLAGS) Don't use ALL_CXXFLAGS for

	build != host.
	<recursive call for build != host>: Clear GMPINC.  Don't bother
	saving CFLAGS.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d2c0211..e5ed55c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,11 @@
-2013-12-04  Jakub Jelinek  <jakub@redhat.com>  
+2013-12-05  Alan Modra  <amodra@gmail.com>
+
+       * configure.ac (BUILD_CXXFLAGS) Don't use ALL_CXXFLAGS for
+       build != host.
+       <recursive call for build != host>: Clear GMPINC.  Don't bother
+       saving CFLAGS.
+
+2013-12-04  Jakub Jelinek  <jakub@redhat.com>
            Marek Polacek  <polacek@redhat.com>
 
        * opts.c (common_handle_option): Handle
@@ -63,7 +70,7 @@
        (find_explicit_erroneous_behaviour): Similarly.
        (gate_isolate_erroneous_paths): Check both of the new
        options.
-       
+
 2013-12-04  Jeff Law  <law@redhat.com>
 
        * expr.c (expand_assignment): Update comments.

diff --git a/gcc/configure b/gcc/configure
index 9e92c63..e6ebd58 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -11287,13 +11287,11 @@ else
        /* | A-Za-z:\\/* ) realsrcdir=${srcdir};;
        *) realsrcdir=../${srcdir};;
        esac
-       saved_CFLAGS="${CFLAGS}"
        CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
-       LDFLAGS="${LDFLAGS_FOR_BUILD}" \
+       LDFLAGS="${LDFLAGS_FOR_BUILD}" GMPINC="" \
        ${realsrcdir}/configure \
                --enable-languages=${enable_languages-all} \
                --target=$target_alias --host=$build_alias --build=$build_alias
-       CFLAGS="${saved_CFLAGS}"
 
        # We just finished tests for the build machine, so rename
        # the file auto-build.h in the gcc directory.
@@ -11788,6 +11786,7 @@ STMP_FIXINC=stmp-fixinc
 if test x$build != x$host || test "x$coverage_flags" != x
 then
     BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
+    BUILD_CXXFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CXXFLAGS_FOR_BUILD)'
     BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
 fi
 
@@ -17919,7 +17918,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 17922 "configure"
+#line 17921 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18025,7 +18024,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 18028 "configure"
+#line 18027 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/gcc/configure.ac b/gcc/configure.ac
index 5cf3825..1c667bb 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1529,13 +1529,11 @@ else
        /* | [A-Za-z]:[\\/]* ) realsrcdir=${srcdir};;
        *) realsrcdir=../${srcdir};;
        esac
-       saved_CFLAGS="${CFLAGS}"
        CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
-       LDFLAGS="${LDFLAGS_FOR_BUILD}" \
+       LDFLAGS="${LDFLAGS_FOR_BUILD}" GMPINC="" \
        ${realsrcdir}/configure \
                --enable-languages=${enable_languages-all} \
                --target=$target_alias --host=$build_alias --build=$build_alias
-       CFLAGS="${saved_CFLAGS}"
 
        # We just finished tests for the build machine, so rename
        # the file auto-build.h in the gcc directory.
@@ -1900,6 +1898,7 @@ STMP_FIXINC=stmp-fixinc           AC_SUBST(STMP_FIXINC)
 if test x$build != x$host || test "x$coverage_flags" != x
 then
     BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
+    BUILD_CXXFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CXXFLAGS_FOR_BUILD)'
     BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
 fi