summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2019-06-07 20:57:19 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2019-06-07 20:57:19 +0100
commit2b326685686a82cbf8b910bbdce59688d5d0810d (patch)
tree48474e02f41b84cba4084de616a862b8ab9445d2
parentac72e850e502390199fa56d2b7fb608fc8f6fa04 (diff)
PR libstdc++/90770 fix missing src/debug/Makefile
PR libstdc++/90770 * configure: Regenerate. * src/Makefile.am (stamp-debug): Also test for missing makefile. * src/Makefile.in: Regenerate. From-SVN: r272050
-rw-r--r--libstdc++-v3/ChangeLog7
-rwxr-xr-xlibstdc++-v3/configure2
-rw-r--r--libstdc++-v3/src/Makefile.am2
-rw-r--r--libstdc++-v3/src/Makefile.in2
4 files changed, 10 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 39f8b0e3575..78aafc6cf21 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2019-06-07 Jonathan Wakely <jwakely@redhat.com>
+
+ PR libstdc++/90770
+ * configure: Regenerate.
+ * src/Makefile.am (stamp-debug): Also test for missing makefile.
+ * src/Makefile.in: Regenerate.
+
2019-06-06 Jonathan Wakely <jwakely@redhat.com>
* include/std/array: Do not include <stdexcept>.
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 7c45c340677..4788acb93bb 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -79874,7 +79874,7 @@ $as_echo "$ac_cv_x86_rdrand" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rdseed support in assembler" >&5
$as_echo_n "checking for rdseed support in assembler... " >&6; }
- if test "${ac_cv_x86_rdseed+set}" = set; then :
+ if ${ac_cv_x86_rdseed+:} false; then :
$as_echo_n "(cached) " >&6
else
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 436c2c56f13..8511a3049c5 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 1283b272078..d91f7158985 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}; \