kbuild: Do not print the build directory with make -s (066b7ed9) · Commits · 戴 / test

Makefile

+50 −47

Original line number	Diff line number	Diff line
		@@ -41,6 +41,29 @@ unexport GREP_OPTIONS
		# descending is started. They are now explicitly listed as the
		# prepare rule.

		# Beautify output
		# ---------------------------------------------------------------------------
		#
		# Normally, we echo the whole command before executing it. By making
		# that echo $($(quiet)$(cmd)), we now have the possibility to set
		# $(quiet) to choose other forms of output instead, e.g.
		#
		# quiet_cmd_cc_o_c = Compiling $(RELDIR)/$@
		# cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
		#
		# If $(quiet) is empty, the whole command will be printed.
		# If it is set to "quiet_", only the short version will be printed.
		# If it is set to "silent_", nothing will be printed at all, since
		# the variable $(silent_cmd_cc_o_c) doesn't exist.
		#
		# A simple variant is to prefix commands with $(Q) - that's useful
		# for commands that shall be hidden in non-verbose mode.
		#
		# $(Q)ln $@ :<
		#
		# If KBUILD_VERBOSE equals 0 then the above command will be hidden.
		# If KBUILD_VERBOSE equals 1 then the above command is displayed.
		#
		# To put more focus on warnings, be less verbose as default
		# Use 'make V=1' to see the full commands

		@@ -51,6 +74,29 @@ ifndef KBUILD_VERBOSE
		KBUILD_VERBOSE = 0
		endif

		ifeq ($(KBUILD_VERBOSE),1)
		quiet =
		Q =
		else
		quiet=quiet_
		Q = @
		endif

		# If the user is running make -s (silent mode), suppress echoing of
		# commands

		ifneq ($(filter 4.%,$(MAKE_VERSION)),) # make-4
		ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),)
		quiet=silent_
		endif
		else # make-3.8x
		ifneq ($(filter s% -s%,$(MAKEFLAGS)),)
		quiet=silent_
		endif
		endif

		export quiet Q KBUILD_VERBOSE

		# Call a source code checker (by default, "sparse") as part of the
		# C compilation.
		#
		@@ -128,8 +174,11 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

		# Fake the "Entering directory" message once, so that IDEs/editors are
		# able to understand relative filenames.
		echodir := @echo
		quiet_echodir := @echo
		silent_echodir := @:
		sub-make: FORCE
		@echo "make[1]: Entering directory \`$(KBUILD_OUTPUT)'"
		$($(quiet)echodir) "make[1]: Entering directory \`$(KBUILD_OUTPUT)'"
		$(if $(KBUILD_VERBOSE:1=),@)$(MAKE) -C $(KBUILD_OUTPUT) \
		KBUILD_SRC=$(CURDIR) \
		KBUILD_EXTMOD="$(KBUILD_EXTMOD)" -f $(CURDIR)/Makefile \
		@@ -292,52 +341,6 @@ endif
		export KBUILD_MODULES KBUILD_BUILTIN
		export KBUILD_CHECKSRC KBUILD_SRC KBUILD_EXTMOD

		# Beautify output
		# ---------------------------------------------------------------------------
		#
		# Normally, we echo the whole command before executing it. By making
		# that echo $($(quiet)$(cmd)), we now have the possibility to set
		# $(quiet) to choose other forms of output instead, e.g.
		#
		# quiet_cmd_cc_o_c = Compiling $(RELDIR)/$@
		# cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
		#
		# If $(quiet) is empty, the whole command will be printed.
		# If it is set to "quiet_", only the short version will be printed.
		# If it is set to "silent_", nothing will be printed at all, since
		# the variable $(silent_cmd_cc_o_c) doesn't exist.
		#
		# A simple variant is to prefix commands with $(Q) - that's useful
		# for commands that shall be hidden in non-verbose mode.
		#
		# $(Q)ln $@ :<
		#
		# If KBUILD_VERBOSE equals 0 then the above command will be hidden.
		# If KBUILD_VERBOSE equals 1 then the above command is displayed.

		ifeq ($(KBUILD_VERBOSE),1)
		quiet =
		Q =
		else
		quiet=quiet_
		Q = @
		endif

		# If the user is running make -s (silent mode), suppress echoing of
		# commands

		ifneq ($(filter 4.%,$(MAKE_VERSION)),) # make-4
		ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),)
		quiet=silent_
		endif
		else # make-3.8x
		ifneq ($(filter s% -s%,$(MAKEFLAGS)),)
		quiet=silent_
		endif
		endif

		export quiet Q KBUILD_VERBOSE

		ifneq ($(CC),)
		ifeq ($(shell $(CC) -v 2>&1 \| grep -c "clang version"), 1)
		COMPILER := clang

Admin message