Patchwork [RFA] Fix gdb snapshots

login
register
mail settings
Submitter Tom Tromey
Date Nov. 29, 2017, 5:04 p.m.
Message ID <87vaht6mov.fsf@tromey.com>
Download mbox | patch
Permalink /patch/24601/
State New
Headers show

Comments

Tom Tromey - Nov. 29, 2017, 5:04 p.m.
Tom> Perhaps rmdir||true will be more to your liking.

How's this?

Tom

commit ea7e34a8e4a79231ea952f711d02729021cbabd0
Author: Tom Tromey <tom@tromey.com>
Date:   Wed Nov 29 09:27:40 2017 -0700

    Fix gdb snapshots
    
    Joel pointed out that gdb snapshots were broken by my Makefile patch
    series.  The bug is that rmdir in distclean was failing, because the
    directories in question did not exist.  This fixes the problem by
    ignoring errors from rmdir.
    
    Tested using "src-release.sh gdb".
    
    2017-11-29  Tom Tromey  <tom@tromey.com>
    
            * Makefile.in (distclean): Handle the case where rmdir fails.

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ebb969998c..dbea503d02 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@ 
+2017-11-29  Tom Tromey  <tom@tromey.com>
+
+	* Makefile.in (distclean): Handle the case where rmdir fails.
+
 2017-11-27  Tom Tromey  <tom@tromey.com>
 
 	* Makefile.in (REMOTE_OBS): Remove.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 6e16bc6682..1ecd5a76b3 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1995,7 +1995,7 @@  distclean: clean
 	rm -f Makefile
 	rm -rf $(DEPDIR)
 	for i in $(CONFIG_SRC_SUBDIR); do \
-		rmdir $$i/$(DEPDIR); \
+		rm -rf $$i/$(DEPDIR) || true; \
 	done
 
 maintainer-clean: local-maintainer-clean do-maintainer-clean distclean