From: Ramsay Jones <ramsay@ramsayjones.plus.com>
To: GIT Mailing-list <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 8/8] Makefile: conditionally include GIT-VERSION-FILE
Date: Thu, 5 Nov 2020 21:10:51 +0000 [thread overview]
Message-ID: <75576fd6-29d7-9700-22a0-bcb30b6ba6bb@ramsayjones.plus.com> (raw)
The 'clean' target is still noticeably slow on cygwin, despite the
improvements made by previous patches. For example, the second
invocation of 'make clean' below:
$ make clean >/dev/null 2>&1
$ make clean
GIT_VERSION = 2.29.0.7.g273f7f9394
...
$
has been timed at 6.430s on my laptop (on old core i5-4200M @ 2.50GHz,
8GB RAM, 1TB HDD).
Notice that the 'clean' target is still causing the $(GIT_VERSION) make
variable to be set (executing the GIT-VERSION-GEN script in the
process). However, the last few commits have removed all dependency on
the $(GIT_VERSION) variable from the 'clean' target. The calculation of
the git version, in order to set this variable, is thus wasted effort.
In order to eliminate such wasted effort, use the value of the internal
$(MAKECMDGOALS) variable to only '-include GIT-VERSION-FILE' when the
target is not 'clean'. (This drops the time down to 4.064s, on my laptop,
giving an improvement of 36.80%).
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---
Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Makefile b/Makefile
index bc9ce28bc3..ca65259e10 100644
--- a/Makefile
+++ b/Makefile
@@ -502,7 +502,9 @@ all::
GIT-VERSION-FILE: FORCE
@$(SHELL_PATH) ./GIT-VERSION-GEN
+ifneq ($(MAKECMDGOALS),clean)
-include GIT-VERSION-FILE
+endif
# Set our default configuration.
#
--
2.29.0
reply other threads:[~2020-11-05 21:10 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=75576fd6-29d7-9700-22a0-bcb30b6ba6bb@ramsayjones.plus.com \
--to=ramsay@ramsayjones.plus.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).