Skip to content

Commit b777434

Browse files
raalkmlJunio C Hamano
authored andcommitted
Support of "make -s": do not output anything of the build itself
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 31d0399 commit b777434

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,11 @@ endif
604604
ifdef NO_PERL_MAKEMAKER
605605
export NO_PERL_MAKEMAKER
606606
endif
607+
608+
QUIET_SUBDIR0 = $(MAKE) -C # space to separate -C and subdir
609+
QUIET_SUBDIR1 =
610+
611+
ifneq ($(findstring $(MAKEFLAGS),s),s)
607612
ifndef V
608613
QUIET_CC = @echo ' ' CC $@;
609614
QUIET_AR = @echo ' ' AR $@;
@@ -615,9 +620,8 @@ ifndef V
615620
$(MAKE) --no-print-directory -C $$subdir
616621
export V
617622
export QUIET_GEN
618-
else
619-
QUIET_SUBDIR0 = $(MAKE) -C
620-
QUIET_SUBDIR1 =
623+
export QUIET_BUILT_IN
624+
endif
621625
endif
622626

623627
# Shell quote (do not use $(call) to accommodate ancient setups);

0 commit comments

Comments
 (0)