From bb7dc663abaa72601edfdce3ca7aff6fdb43bffe Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 19 Apr 2016 09:26:16 +0100 Subject: [PATCH 1/1] Sync Makefile.tpl with gcc. 2016-04-13 Segher Boessenkool PR bootstrap/70173 * Makefile.tpl (local-distclean): Delete the libcc1, gnattools, and gotools directories. Delete the stage_final file. * Makefile.in: Regenerate. --- ChangeLog | 11 +++++++++++ Makefile.in | 5 +++-- Makefile.tpl | 5 +++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3904dc134d..9ab3101a4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2016-04-19 Nick Clifton + + * Import this patch from the GCC mainline: + + 2016-04-13 Segher Boessenkool + + PR bootstrap/70173 + * Makefile.tpl (local-distclean): Delete the libcc1, gnattools, + and gotools directories. Delete the stage_final file. + * Makefile.in: Regenerate. + 2016-03-17 Cary Coutant * configure.ac: Add mips and s390 to the gold target check. diff --git a/Makefile.in b/Makefile.in index 1d01a62514..0de4167083 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2317,7 +2317,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 @@ -2329,7 +2329,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 5a9a83bfb7..6be6c4eb33 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -811,7 +811,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 @@ -823,7 +823,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: -- 2.34.1