Currently, distclean does not remove the libcc1, gnattools, and gotools
directories, and not the stage_final file either.  Fix that.

This finishes PR70173.

Tested on powerpc64-linux, --enable-languages=all,ada,go,obj-c++ ,
followed by "make distclean".  Is this okay for trunk?


Segher


2016-04-11  Segher Boessenkool  <seg...@kernel.crashing.org>

        PR bootstrap/70173
        * Makefile.tpl (local-distclean): Delete the libcc1, gnattools,
        and gotools directories.  Delete the stage_final file.
        * Makefile.in: Regenerate.

---
 Makefile.in  | 5 +++--
 Makefile.tpl | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index a519a54..1522e39 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2316,7 +2316,7 @@ local-clean:
 
 local-distclean:
        -rm -f Makefile config.status config.cache mh-frag mt-frag
-       -rm -f maybedep.tmp serdep.tmp
+       -rm -f maybedep.tmp serdep.tmp stage_final
        -if [ "$(TARGET_SUBDIR)" != "." ]; then \
          rm -rf $(TARGET_SUBDIR); \
        else true; fi
@@ -2328,7 +2328,8 @@ local-distclean:
        -rm -f texinfo/doc/Makefile texinfo/po/POTFILES
        -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
        -rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null
-       -rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null
+       -rmdir fastjar gcc gnattools gotools libcc1 libiberty 2>/dev/null
+       -rmdir texinfo zlib 2>/dev/null
        -find . -name config.cache -exec rm -f {} \; \; 2>/dev/null
 
 local-maintainer-clean:
diff --git a/Makefile.tpl b/Makefile.tpl
index 829f664..6b2eb6a 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -810,7 +810,7 @@ local-clean:
 
 local-distclean:
        -rm -f Makefile config.status config.cache mh-frag mt-frag
-       -rm -f maybedep.tmp serdep.tmp
+       -rm -f maybedep.tmp serdep.tmp stage_final
        -if [ "$(TARGET_SUBDIR)" != "." ]; then \
          rm -rf $(TARGET_SUBDIR); \
        else true; fi
@@ -822,7 +822,8 @@ local-distclean:
        -rm -f texinfo/doc/Makefile texinfo/po/POTFILES
        -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
        -rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null
-       -rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null
+       -rmdir fastjar gcc gnattools gotools libcc1 libiberty 2>/dev/null
+       -rmdir texinfo zlib 2>/dev/null
        -find . -name config.cache -exec rm -f {} \; \; 2>/dev/null
 
 local-maintainer-clean:
-- 
1.9.3

Reply via email to