From aaadd96e7134175ac6a19236d94c63cbe6e1363a Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 14 Jun 2019 19:10:57 +0100 Subject: [PATCH] PR libstdc++/90770 fix missing src/debug/Makefile Backport from mainline 2019-06-07 Jonathan Wakely PR libstdc++/90770 * src/Makefile.am (stamp-debug): Also test for missing makefile. * src/Makefile.in: Regenerate. From-SVN: r272299 --- libstdc++-v3/ChangeLog | 9 +++++++++ libstdc++-v3/src/Makefile.am | 2 +- libstdc++-v3/src/Makefile.in | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2844d7701ddf..93e39e954270 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2019-06-14 Jonathan Wakely + + Backport from mainline + 2019-06-07 Jonathan Wakely + + PR libstdc++/90770 + * src/Makefile.am (stamp-debug): Also test for missing makefile. + * src/Makefile.in: Regenerate. + 2019-06-14 Jonathan Wakely Backport from mainline diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 436c2c56f132..8511a3049c53 100644 --- 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 1283b2720785..d91f71589859 100644 --- 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}; \ -- 2.47.2