mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Makefile: improve SPARSE_FLAGS customisation
In order to enable greater user customisation of the SPARSE_FLAGS variable, we introduce a new SP_EXTRA_FLAGS variable to use for target specific settings. Without using the new variable, setting the SPARSE_FLAGS on the 'make' command-line would also override the value set by the target-specific rules in the Makefile (effectively making them useless). Also, this enables the SP_EXTRA_FLAGS to be used in the future for any other internal customisations, such as for some platform specific values. In addition, we initialise the SPARSE_FLAGS to the default (empty) value using a conditional assignment (?=). This allows SPARSE_FLAGS to be set from the environment as well as from the command-line. Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
f42615bef1
commit
15caca28da
14
Makefile
14
Makefile
|
@ -568,7 +568,11 @@ SPATCH = spatch
|
|||
|
||||
export TCL_PATH TCLTK_PATH
|
||||
|
||||
SPARSE_FLAGS =
|
||||
# user customisation variable for 'sparse' target
|
||||
SPARSE_FLAGS ?=
|
||||
# internal/platform customisation variable for 'sparse'
|
||||
SP_EXTRA_FLAGS =
|
||||
|
||||
SPATCH_FLAGS = --all-includes --patch .
|
||||
|
||||
|
||||
|
@ -2347,10 +2351,10 @@ gettext.sp gettext.s gettext.o: GIT-PREFIX
|
|||
gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
|
||||
-DGIT_LOCALE_PATH='"$(localedir_relative_SQ)"'
|
||||
|
||||
http-push.sp http.sp http-walker.sp remote-curl.sp imap-send.sp: SPARSE_FLAGS += \
|
||||
http-push.sp http.sp http-walker.sp remote-curl.sp imap-send.sp: SP_EXTRA_FLAGS += \
|
||||
-DCURL_DISABLE_TYPECHECK
|
||||
|
||||
pack-revindex.sp: SPARSE_FLAGS += -Wno-memcpy-max-count
|
||||
pack-revindex.sp: SP_EXTRA_FLAGS += -Wno-memcpy-max-count
|
||||
|
||||
ifdef NO_EXPAT
|
||||
http-walker.sp http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
|
||||
|
@ -2364,7 +2368,7 @@ endif
|
|||
ifdef USE_NED_ALLOCATOR
|
||||
compat/nedmalloc/nedmalloc.sp compat/nedmalloc/nedmalloc.o: EXTRA_CPPFLAGS = \
|
||||
-DNDEBUG -DREPLACE_SYSTEM_ALLOCATOR
|
||||
compat/nedmalloc/nedmalloc.sp: SPARSE_FLAGS += -Wno-non-pointer-null
|
||||
compat/nedmalloc/nedmalloc.sp: SP_EXTRA_FLAGS += -Wno-non-pointer-null
|
||||
endif
|
||||
|
||||
git-%$X: %.o GIT-LDFLAGS $(GITLIBS)
|
||||
|
@ -2688,7 +2692,7 @@ SP_OBJ = $(patsubst %.o,%.sp,$(C_OBJ))
|
|||
|
||||
$(SP_OBJ): %.sp: %.c GIT-CFLAGS FORCE
|
||||
$(QUIET_SP)cgcc -no-compile $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) \
|
||||
$(SPARSE_FLAGS) $<
|
||||
$(SPARSE_FLAGS) $(SP_EXTRA_FLAGS) $<
|
||||
|
||||
.PHONY: sparse $(SP_OBJ)
|
||||
sparse: $(SP_OBJ)
|
||||
|
|
Loading…
Reference in a new issue