diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2006-07-12 17:07:09 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2006-07-12 17:07:09 +0000 |
| commit | f67a67d831550961badfdd84556bcffcfded5651 (patch) | |
| tree | 91e5efb71b1b1a03f0df04ccd4847c5cf509ba01 | |
| parent | e9186fbe67cc6de61ac858e3e3ed0259d61635bb (diff) | |
| download | gcc-f67a67d831550961badfdd84556bcffcfded5651.zip gcc-f67a67d831550961badfdd84556bcffcfded5651.tar.gz gcc-f67a67d831550961badfdd84556bcffcfded5651.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.am | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.in | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/lib/libstdc++.exp | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0863629..bd23530 100644 --- 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 2f9ee2e..3b6afd0 100644 --- 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 9c6e532..fb5f6b4 100644 --- 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 64ce9d1..e652460 100644 --- 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" |