Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.
Signed-off-by: Fernando J. Pereda <ferdy@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
33580fbd30
commit
3b486cd229
4
Makefile
4
Makefile
@ -641,7 +641,7 @@ ifeq ($(TCLTK_PATH),)
|
|||||||
NO_TCLTK=NoThanks
|
NO_TCLTK=NoThanks
|
||||||
endif
|
endif
|
||||||
|
|
||||||
QUIET_SUBDIR0 = $(MAKE) -C # space to separate -C and subdir
|
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
|
||||||
QUIET_SUBDIR1 =
|
QUIET_SUBDIR1 =
|
||||||
|
|
||||||
ifneq ($(findstring $(MAKEFLAGS),w),w)
|
ifneq ($(findstring $(MAKEFLAGS),w),w)
|
||||||
@ -657,7 +657,7 @@ ifndef V
|
|||||||
QUIET_LINK = @echo ' ' LINK $@;
|
QUIET_LINK = @echo ' ' LINK $@;
|
||||||
QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
|
QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
|
||||||
QUIET_GEN = @echo ' ' GEN $@;
|
QUIET_GEN = @echo ' ' GEN $@;
|
||||||
QUIET_SUBDIR0 = @subdir=
|
QUIET_SUBDIR0 = +@subdir=
|
||||||
QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
|
QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
|
||||||
$(MAKE) $(PRINT_DIR) -C $$subdir
|
$(MAKE) $(PRINT_DIR) -C $$subdir
|
||||||
export V
|
export V
|
||||||
|
Loading…
Reference in New Issue
Block a user