Commit e572d088 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Arnaldo Carvalho de Melo
Browse files

tools build: Add tools tree support for 'make -s' 



When doing a kernel build with 'make -s', everything is silenced except
the objtool build.  That's because the tools tree support for silent
builds is some combination of missing and broken.

Three changes are needed to fix it:

- Makefile: propagate '-s' to the sub-make's MAKEFLAGS variable so the
  tools Makefiles can see it.

- tools/scripts/Makefile.include: fix the tools Makefiles' ability to
  recognize '-s'.  The MAKE_VERSION and MAKEFLAGS checks are copied from
  the top-level Makefile.  This silences the "DESCEND objtool" message.

- tools/build/Makefile.build: add support to the tools Build files for
  recognizing '-s'.  Again the MAKE_VERSION and MAKEFLAGS checks are
  copied from the top-level Makefile.  This silences all the object
  compile/link messages.

Reported-and-Tested-by: default avatarPeter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Michal Marek <mmarek@suse.com>
Link: http://lkml.kernel.org/r/e8967562ef640c3ae9a76da4ae0f4e47df737c34.1484799200.git.jpoimboe@redhat.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent bf062bd2

Makefile

+4 −2
Original line number Diff line number Diff line
@@ -87,10 +87,12 @@ endif 
ifneq ($(filter 4.%,$(MAKE_VERSION)),)	# make-4

ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),)

  quiet=silent_

  tools_silent=s

endif

else					# make-3.8x

ifneq ($(filter s% -s%,$(MAKEFLAGS)),)

  quiet=silent_

  tools_silent=-s

endif

endif
@@ -1607,11 +1609,11 @@ image_name: 
# Clear a bunch of variables before executing the submake

tools/: FORCE

	$(Q)mkdir -p $(objtree)/tools

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/



tools/%: FORCE

	$(Q)mkdir -p $(objtree)/tools

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/ $*

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/ $*



# Single targets

# ---------------------------------------------------------------------------

tools/build/Makefile.build

+10 −0
Original line number Diff line number Diff line
@@ -19,6 +19,16 @@ else 
  Q=@

endif



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



build-dir := $(srctree)/tools/build



# Define $(fixdep) for dep-cmd function

tools/scripts/Makefile.include

+11 −1
Original line number Diff line number Diff line
@@ -46,6 +46,16 @@ else 
NO_SUBDIR = :

endif



ifneq ($(filter 4.%,$(MAKE_VERSION)),)  # make-4

ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),)

  silent=1

endif

else					# make-3.8x

ifneq ($(filter s% -s%,$(MAKEFLAGS)),)

  silent=1

endif

endif



#

# Define a callable command for descending to a new directory

#
@@ -58,7 +68,7 @@ descend = \ 
QUIET_SUBDIR0  = +$(MAKE) $(COMMAND_O) -C # space to separate -C and subdir

QUIET_SUBDIR1  =



ifneq ($(findstring $(MAKEFLAGS),s),s)

ifneq ($(silent),1)

  ifneq ($(V),1)

	QUIET_CC       = @echo '  CC       '$@;

	QUIET_CC_FPIC  = @echo '  CC FPIC  '$@;

CRA Git | Maintained and supported by SUSTech CRA and CCSE