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
This commit is contained in:
Rainer Orth 2003-06-05 22:22:12 +00:00 committed by Rainer Orth
parent b4e0fcc38e
commit bddc310768
5 changed files with 27 additions and 1 deletions

View File

@ -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),

View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -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}