[PATCH] Makefile: limit specifying -DGIT_USER_AGENT=... to keep ccache efficient

Nguyễn Thái Ngọc Duy· Jun 24, 2012, 12:37 UTC · lore

GIT_USER_AGENT changes as HEAD changes. Defining it in BASIC_FLAGS means every time HEAD changes, the compiling options for every object file is changed, which defeats the purpose of using ccache.

As version.c is the only file that uses this definition, limit defining only when compiling this file.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Show changes to Makefile +2 −2

diff --git a/Makefile b/Makefile
index f62ca2a..b3ce00d 100644
--- a/Makefile
+++ b/Makefile
@@ -1929,7 +1929,6 @@ endif
 GIT_USER_AGENT_SQ = $(subst ','\'',$(GIT_USER_AGENT))
 GIT_USER_AGENT_CQ = "$(subst ",\",$(subst \,\\,$(GIT_USER_AGENT)))"
 GIT_USER_AGENT_CQ_SQ = $(subst ','\'',$(GIT_USER_AGENT_CQ))
-BASIC_CFLAGS += -DGIT_USER_AGENT='$(GIT_USER_AGENT_CQ_SQ)'
 
 ifdef DEFAULT_HELP_FORMAT
 BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
@@ -2000,7 +1999,8 @@ builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
 	'-DGIT_INFO_PATH="$(infodir_SQ)"'
 
 version.sp version.s version.o: EXTRA_CPPFLAGS = \
-	'-DGIT_VERSION="$(GIT_VERSION)"'
+	'-DGIT_VERSION="$(GIT_VERSION)"' \
+	'-DGIT_USER_AGENT="$(GIT_USER_AGENT)"'
 
 $(BUILT_INS): git$X
 	$(QUIET_BUILT_IN)$(RM) $@ && \

-- 
1.7.8

Nguyen Thai Ngoc Duy· Jun 24, 2012, 14:56 UTC · re: Nguyễn Thái Ngọc Duy · lore

Re: [PATCH] Makefile: limit specifying -DGIT_USER_AGENT=... to keep ccache efficient

On Sun, Jun 24, 2012 at 7:37 PM, Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:

Show 6 quoted lines

> GIT_USER_AGENT changes as HEAD changes. Defining it in BASIC_FLAGS
> means every time HEAD changes, the compiling options for every object
> file is changed, which defeats the purpose of using ccache.
>
> As version.c is the only file that uses this definition, limit
> defining only when compiling this file.

Uhm.. something like this is in jk/version-string-dependency already. Sorry for the noise.

-- 
Duy

patchMakefile: limit specifying -DGIT_USER_AGENT=... to keep ccache efficient