[gcc/devel/omp/gcc-9] PR libstdc++/90770 fix missing src/debug/Makefile
Tobias Burnus
burnus@gcc.gnu.org
Thu Mar 5 13:59:00 GMT 2020
https://gcc.gnu.org/g:aaadd96e7134175ac6a19236d94c63cbe6e1363a
commit aaadd96e7134175ac6a19236d94c63cbe6e1363a
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Fri Jun 14 19:10:57 2019 +0100
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:
---
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 2844d77..93e39e9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,6 +1,15 @@
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
2019-05-21 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/90252
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 436c2c5..8511a30 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 1283b27..d91f715 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}; \
More information about the Libstdc++-cvs
mailing list