summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>2006-07-13 00:14:06 +0000
committerbkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>2006-07-13 00:14:06 +0000
commita5108ab5d334481e41cac4cb76c3ff513f8bfdb1 (patch)
tree002e875feec6fef71508bdd1bc76f4e1832df0dc
parenta3a710aeb939f38dd83bdc3b8514ec33aab83f56 (diff)
downloadppe42-gcc-a5108ab5d334481e41cac4cb76c3ff513f8bfdb1.tar.gz
ppe42-gcc-a5108ab5d334481e41cac4cb76c3ff513f8bfdb1.zip
2006-07-12 Benjamin Kosnik <bkoz@redhat.com>
* include/Makefile.am: Revert last change. * include/Makefile.in: Same. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115402 138bc75d-0d04-0410-961f-82ee72b054a4
-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 bd23530d293..4927457f6ed 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 3b6afd03623..2f9ee2ef588 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 fb5f6b460b5..9c6e532ea42 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 =
OpenPOWER on IntegriCloud