Makefile.am (pch_output): Don't precompile extc++.h.

2006-07-12  Benjamin Kosnik  <bkoz@redhat.com>

	* include/Makefile.am (pch_output): Don't precompile extc++.h.
	(pch_output_dirs): Same.
	* include/Makefile.in: Regenerate.

	* testsuite/lib/libstdc++.exp: Test PCH with stdtr1c++.h.

From-SVN: r115379

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0863629ea7468c8d1bb908a511d0a4764830ffeb..bd23530d293a1c14294681b81772f2df855c5c23 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-12  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * include/Makefile.am (pch_output): Don't precompile extc++.h.
+       (pch_output_dirs): Same.
+       * include/Makefile.in: Regenerate.
+
+       * testsuite/lib/libstdc++.exp: Test PCH with stdtr1c++.h.
+       
 2006-07-11  Paolo Carlini  <pcarlini@suse.de>
 
        * include/ext/codecvt_specializations.h: Fix typo in commit

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 2f9ee2ef58870944e53562d2a58a92797e0ed8a4..3b6afd03623874b44e3623dfc49b39ca130fd8de 100644 (file)
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -782,9 +782,9 @@ pch3_output_installdir = ${host_installdir}/extc++.h.gch
 pch3_output = ${pch3_output_builddir}/O2g.gch
 
 
-pch_output = ${pch1_output} ${pch2_output} ${pch3_output}
+pch_output = ${pch1_output} ${pch2_output} 
 pch_output_dirs = \
-       ${pch1_output_builddir} ${pch2_output_builddir} ${pch3_output_builddir}
+       ${pch1_output_builddir} ${pch2_output_builddir} 
 PCHFLAGS=-Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS)
 if GLIBCXX_BUILD_PCH
 pch_build = ${pch_output}

diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 9c6e532ea425a16686543e299076bb8c5a6dd328..fb5f6b460b57a3b7fa71e41035985461bdb86e49 100644 (file)
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -992,9 +992,9 @@ pch3_source = ${glibcxx_srcdir}/include/precompiled/extc++.h
 pch3_output_builddir = ${host_builddir}/extc++.h.gch
 pch3_output_installdir = ${host_installdir}/extc++.h.gch
 pch3_output = ${pch3_output_builddir}/O2g.gch
-pch_output = ${pch1_output} ${pch2_output} ${pch3_output}
+pch_output = ${pch1_output} ${pch2_output} 
 pch_output_dirs = \
-       ${pch1_output_builddir} ${pch2_output_builddir} ${pch3_output_builddir}
+       ${pch1_output_builddir} ${pch2_output_builddir} 
 
 PCHFLAGS = -Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS)
 @GLIBCXX_BUILD_PCH_FALSE@pch_build = 

diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 64ce9d18b379db11d0682df31e58e24a950ee892..e6524603e8f8c304afc13a96fc3adf2b396f9d9c 100644 (file)
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -211,7 +211,7 @@ proc libstdc++_init { testfile } {
        close $f
 
        set lines [v3_target_compile $src "config[pid].o" object \
-                  "additional_flags=-include additional_flags=bits/stdc++.h"]
+                "additional_flags=-include additional_flags=bits/stdtr1c++.h"]
        if {$lines == "" } {
 #          set PCH_CXXFLAGS "-include bits/extc++.h"
            set PCH_CXXFLAGS "-include bits/stdtr1c++.h"