aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kosnik <bkoz@redhat.com>2006-07-13 00:14:06 +0000
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2006-07-13 00:14:06 +0000
commit04dc1691158ddabb65ce301db63543e34ab1bb90 (patch)
tree002e875feec6fef71508bdd1bc76f4e1832df0dc
parent5f89204ee892355151e00c42e98f75e74416aac8 (diff)
downloadgcc-04dc1691158ddabb65ce301db63543e34ab1bb90.zip
gcc-04dc1691158ddabb65ce301db63543e34ab1bb90.tar.gz
gcc-04dc1691158ddabb65ce301db63543e34ab1bb90.tar.bz2
Makefile.am: Revert last change.
2006-07-12 Benjamin Kosnik <bkoz@redhat.com> * include/Makefile.am: Revert last change. * include/Makefile.in: Same. From-SVN: r115402
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/Makefile.am4
-rw-r--r--libstdc++-v3/include/Makefile.in4
3 files changed, 9 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bd23530..4927457 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2006-07-12 Benjamin Kosnik <bkoz@redhat.com>
+ * include/Makefile.am: Revert last change.
+ * include/Makefile.in: Same.
+
+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.
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 3b6afd0..2f9ee2e 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}
+pch_output = ${pch1_output} ${pch2_output} ${pch3_output}
pch_output_dirs = \
- ${pch1_output_builddir} ${pch2_output_builddir}
+ ${pch1_output_builddir} ${pch2_output_builddir} ${pch3_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 fb5f6b4..9c6e532 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}
+pch_output = ${pch1_output} ${pch2_output} ${pch3_output}
pch_output_dirs = \
- ${pch1_output_builddir} ${pch2_output_builddir}
+ ${pch1_output_builddir} ${pch2_output_builddir} ${pch3_output_builddir}
PCHFLAGS = -Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS)
@GLIBCXX_BUILD_PCH_FALSE@pch_build =