[Bug bootstrap/52840] bootstrap fails in libstdc++, missing compatibility.lo

[aldot at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52840

--- Comment #2 from Bernhard Reutner-Fischer <aldot at gcc dot gnu.org> 
2012-04-03 10:20:07 UTC ---
The patchlet below reinstates bootstrapping for me.


diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bb8bc2a..d662ec1 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-03  Bernhard Reutner-Fischer  <al...@gcc.gnu.org>
+
+    * src/Makefile.am (build-debug): Do not adjust vpath dir, remove
+    Makefile.tmp
+    * src/Makefile.in: Adjust as per above.
+
 2012-04-02  Tristan Gingold  <ging...@adacore.com>

     * crossconfig.m4 (*-*-*vms*): Add.
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 28430cf..a1eb04d 100644
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -293,7 +293,7 @@ build-debug: stamp-debug
       mv Makefile Makefile.tmp; \
       sed -e 's,all-local: all-once,all-local:,' \
           -e 's,install-data-local: install-data-once,install-data-local:,' \
-          -e 's,src/c,src/debug/c,' \
+          -e '/vpath/!s,src/c,src/debug/c,' \
       < Makefile.tmp > Makefile ; \
       $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \
       toolexeclibdir=$(glibcxx_toolexeclibdir)/debug all) ;
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index 3c1facf..b10d853 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -914,7 +914,7 @@ build-debug: stamp-debug
       mv Makefile Makefile.tmp; \
       sed -e 's,all-local: all-once,all-local:,' \
           -e 's,install-data-local: install-data-once,install-data-local:,' \
-          -e 's,src/c,src/debug/c,' \
+          -e '/vpath/!s,src/c,src/debug/c,' \
       < Makefile.tmp > Makefile ; \
       $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \
       toolexeclibdir=$(glibcxx_toolexeclibdir)/debug all) ;