PR libstdc++/90770 fix missing src/debug/Makefile

Backport from mainline
2019-06-07  Jonathan Wakely  <jwakely@redhat.com>

	PR libstdc++/90770
	* src/Makefile.am (stamp-debug): Also test for missing makefile.
	* src/Makefile.in: Regenerate.

From-SVN: r275308

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index dd99959b9dde2468211ae1e85b9f9565dae488fe..732c70f289addddf188340b93badebf7d24cbb1a 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2019-09-02  Jonathan Wakely  <jwakely@redhat.com>
+
+       Backport from mainline
+       2019-06-07  Jonathan Wakely  <jwakely@redhat.com>
+
+       PR libstdc++/90770
+       * src/Makefile.am (stamp-debug): Also test for missing makefile.
+       * src/Makefile.in: Regenerate.
+
 2019-09-02  Jonathan Wakely  <jwakely@redhat.com>
 
        Backport from mainline

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index a3c0d98ba86264e14a76b4a79a21c54955e2d242..0d07285af378553d919674f1b1de25b71d3eddad 100644 (file)
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -321,7 +321,7 @@ endif
 # Take care to fix all possibly-relative paths.
 debugdir = ${glibcxx_builddir}/src/debug
 stamp-debug:
-       if test ! -d ${debugdir}; then \
+       if test ! -d ${debugdir} || test ! -f ${debugdir}/Makefile ; then \
          mkdir -p ${debugdir}; \
          for d in $(SUBDIRS); do mkdir -p  ${debugdir}/$$d; done; \
          (cd ${debugdir}; \

diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index ced145db6b821f81bb5db469b688a07de7ba5aa8..f0755f015a1a9ef6de7f51a47d03cc3cd7cf32d2 100644 (file)
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -993,7 +993,7 @@ libstdc++convenience.la: $(toolexeclib_LTLIBRARIES)
        fi; \
        echo `date` > stamp-libstdc++convenience;
 stamp-debug:
-       if test ! -d ${debugdir}; then \
+       if test ! -d ${debugdir} || test ! -f ${debugdir}/Makefile ; then \
          mkdir -p ${debugdir}; \
          for d in $(SUBDIRS); do mkdir -p  ${debugdir}/$$d; done; \
          (cd ${debugdir}; \