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: r272299

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2844d7701ddf728ba6d880101593cf8c9af63aac..93e39e95427059d3a1adc4ffea0e3d47d88e31b3 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2019-06-14  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-06-14  Jonathan Wakely  <jwakely@redhat.com>
 
        Backport from mainline

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 436c2c56f132e45ac41e0aadf2907de87021e333..8511a3049c53aa22ec5f2046999897317a543494 100644 (file)
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -325,7 +325,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 1283b2720785acdcbb3047d84b57b6ba421096f6..d91f715898594e11b59c069f24b3b0bc87662f3b 100644 (file)
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -1047,7 +1047,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}; \