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

Message ID 20190607195839.GA13418@redhat.com
State New
Headers show
Series
  • PR libstdc++/90770 fix missing src/debug/Makefile
Related show

Commit Message

Jonathan Wakely June 7, 2019, 7:58 p.m.
PR libstdc++/90770
	* configure: Regenerate.
	* src/Makefile.am (stamp-debug): Also test for missing makefile.
	* src/Makefile.in: Regenerate.

I'm not sure how the src/debug/Makefile gets removed without the
directory it's in being removed, but this makes it work despite that.

Committed to trunk. I think this should be backported too.
commit 756e59b0a6d1202547cb618d1eb422dddf16fc80
Author: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Fri Jun 7 19:57:19 2019 +0000

    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.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@272050 138bc75d-0d04-0410-961f-82ee72b054a4

Patch

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}; \