From: Jonathan Wakely <jwakely@redhat.com>
To: gcc-patches@gcc.gnu.org
Cc: Jason Merrill <jason@redhat.com>,
Alexandre Oliva <aoliva@gcc.gnu.org>,
Segher Boessenkool <segher@kernel.crashing.org>
Subject: [PATCH] c++tools: Fix Makefile to properly clean and rebuild [PR101834]
Date: Thu, 30 Mar 2023 13:15:46 +0100 [thread overview]
Message-ID: <20230330121546.1454231-1-jwakely@redhat.com> (raw)
Tested with various combinations of 'make clean all' etc.
OK for trunk?
And backport to gcc-12 and gcc-11 after some soak time on trunk?
-- >8 --
The c++tools makefile doesn't remove progressively more files in each of
mostlyclean, clean, and distclean. Instead, each removes a different set
of files (and some files are not removed by any target). Use
prerequisites so that everything is removed.
Also, building in the $objdir/c++tools directory doesn't work, because
the INSTALL variable is never set. It works when building from the
top-level because INSTALL is set in the environment when recursively
invoking make for sub-directories.
c++tools/ChangeLog:
PR bootstrap/101834
* Makefile.in (INSTALL): Set variable.
(mostlyclean): Mark as a phony target.
(clean): Add mostlyclean as a prerequisite.
(distclean): Add clean as a prerequisite and remove more files.
(maintainer-clean): Add distclean as a prerequisite.
---
c++tools/Makefile.in | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/c++tools/Makefile.in b/c++tools/Makefile.in
index 56cba090135..77bda3d56dc 100644
--- a/c++tools/Makefile.in
+++ b/c++tools/Makefile.in
@@ -22,6 +22,7 @@ libexecdir := @libexecdir@
target_noncanonical := @target_noncanonical@
gcc_version := $(shell @get_gcc_base_ver@ $(srcdir)/../gcc/BASE-VER)
libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
+INSTALL := @INSTALL@
INSTALL_PROGRAM := @INSTALL_PROGRAM@
INSTALL_STRIP_PROGRAM := $(srcdir)/../install-sh -c -s
AUTOCONF := @AUTOCONF@
@@ -41,13 +42,14 @@ all::
mostlyclean::
rm -f $(MAPPER.O)
-clean::
+clean:: mostlyclean
rm -f g++-mapper-server$(exeext)
-distclean::
- rm -f config.log config.status config.h
+distclean:: clean
+ rm -f config.log config.status config.h config.cache Makefile
+ rm -f $(MAPPER.O:%.o=%.d)
-maintainer-clean::
+maintainer-clean:: distclean
install::
@@ -132,6 +134,6 @@ config.h: config.status config.h.in
config.status: $(srcdir)/configure $(srcdir)/config.h.in
if test -x $@; then ./$@ -recheck; else $< @configure_args@; fi
-.PHONY: all check clean distclean maintainer-clean
+.PHONY: all check mostlyclean clean distclean maintainer-clean
-include $(MAPPER.O:.o=.d)
--
2.39.2
next reply other threads:[~2023-03-30 12:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-30 12:15 Jonathan Wakely [this message]
2023-03-30 16:22 ` Segher Boessenkool
2023-03-30 21:55 ` Jason Merrill
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230330121546.1454231-1-jwakely@redhat.com \
--to=jwakely@redhat.com \
--cc=aoliva@gcc.gnu.org \
--cc=gcc-patches@gcc.gnu.org \
--cc=jason@redhat.com \
--cc=segher@kernel.crashing.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).