From: Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
Date: Thu, 5 Jun 2003 22:22:12 +0000 (+0000)
Subject: acinclude.m4 (GLIBCPP_CHECK_PCH): Only set glibcpp_PCHFLAGS if .gch compilation works.
X-Git-Tag: releases/gcc-3.4.0~6125
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bddc3107689ee3ff5c04c1eee1876efe18db061c;p=thirdparty%2Fgcc.git

acinclude.m4 (GLIBCPP_CHECK_PCH): Only set glibcpp_PCHFLAGS if .gch compilation works.

	* acinclude.m4 (GLIBCPP_CHECK_PCH): Only set glibcpp_PCHFLAGS if
	.gch compilation works.
	* aclocal.m4, configure: Regenerate.
	* testsuite_flags.in (--build-cxx): Use glibcpp_PCHFLAGS to
	initialize PCHFLAGS.

From-SVN: r67515
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8b457cbbde0a..a76d385fd6e6 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-05  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* acinclude.m4 (GLIBCPP_CHECK_PCH): Only set glibcpp_PCHFLAGS if
+	.gch compilation works.
+	* aclocal.m4, configure: Regenerate.
+	* testsuite_flags.in (--build-cxx): Use glibcpp_PCHFLAGS to
+	initialize PCHFLAGS.
+
 2003-06-04  Paolo Carlini  <pcarlini@unitus.it>
 
 	* include/bits/basic_string.h (_M_fold, insert(iterator, _CharT),
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index ed9eda002416..b96f517dd792 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1464,6 +1464,12 @@ AC_DEFUN(GLIBCPP_CHECK_PCH, [
 
   CXXFLAGS="$ac_save_CXXFLAGS"
   AM_CONDITIONAL(GLIBCPP_BUILD_PCH, test "$glibcpp_pch_comp" = yes)
+  if test "$glibcpp_pch_comp" = yes; then
+	glibcpp_PCHFLAGS="-include bits/stdc++.h"
+  else
+	glibcpp_PCHFLAGS=""
+  fi
+  AC_SUBST(glibcpp_PCHFLAGS)
 ])
 
 dnl
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 975bb1cf2c0c..f130d561b259 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -1476,6 +1476,12 @@ AC_DEFUN(GLIBCPP_CHECK_PCH, [
 
   CXXFLAGS="$ac_save_CXXFLAGS"
   AM_CONDITIONAL(GLIBCPP_BUILD_PCH, test "$glibcpp_pch_comp" = yes)
+  if test "$glibcpp_pch_comp" = yes; then
+	glibcpp_PCHFLAGS="-include bits/stdc++.h"
+  else
+	glibcpp_PCHFLAGS=""
+  fi
+  AC_SUBST(glibcpp_PCHFLAGS)
 ])
 
 dnl
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index ab52d2d148f4..ac499c5aaf5d 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -2784,6 +2784,12 @@ else
   GLIBCPP_BUILD_PCH_TRUE='#'
   GLIBCPP_BUILD_PCH_FALSE=
 fi
+  if test "$glibcpp_pch_comp" = yes; then
+	glibcpp_PCHFLAGS="-include bits/stdc++.h"
+  else
+	glibcpp_PCHFLAGS=""
+  fi
+  
 
 
 # Enable all the variable C++ stuff.  C_MBCHAR must come early.
diff --git a/libstdc++-v3/testsuite_flags.in b/libstdc++-v3/testsuite_flags.in
index 568650dc5109..4858c2e6606a 100755
--- a/libstdc++-v3/testsuite_flags.in
+++ b/libstdc++-v3/testsuite_flags.in
@@ -43,7 +43,7 @@ case ${query} in
       echo ${CXX}
       ;;
     --build-cxx)
-      PCHFLAGS="-include bits/stdc++.h"
+      PCHFLAGS="@glibcpp_PCHFLAGS@"
       CXX_build="@glibcpp_CXX@ ${PCHFLAGS}"
       CXX=`echo "$CXX_build" | sed 's,gcc/xgcc ,gcc/g++ ,'`
       echo ${CXX}