PR bootstrap/52840: libstdc++: let debug find sources for compatibility.lo

2012-04-05  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>

	PR bootstrap/52840
	* src/Makefile.am (build-debug): Do not adjust vpath dir, remove
	Makefile.tmp
	* src/Makefile.in: Adjust as per above.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@186156 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d7d3b4c..5323e2e 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-05  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>
+
+       PR bootstrap/52840
+       * src/Makefile.am (build-debug): Do not adjust vpath dir, remove
+       Makefile.tmp
+       * src/Makefile.in: Adjust as per above.
+
 2012-04-04  Uros Bizjak  <ubizjak@gmail.com>
 
        Partially revert:

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 28430cf..52cf0d5 100644 (file)
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -293,8 +293,9 @@ 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 ; \
+         rm -f Makefile.tmp ; \
          $(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..d211ba9 100644 (file)
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -914,8 +914,9 @@ 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 ; \
+         rm -f Makefile.tmp ; \
          $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \
          toolexeclibdir=$(glibcxx_toolexeclibdir)/debug all) ;