summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJosh Poimboeuf <jpoimboe@redhat.com>2017-01-18 23:16:55 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2017-01-26 14:29:00 -0500
commite572d0887137acfc53f18175522964ec19d88175 (patch)
tree7733ccd37bfbd4888304469434eaed9e2bd58acd /Makefile
parentbf062bd20e6c4988a9c593824ea6bb58730b6289 (diff)
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: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Josh 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: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 098840012b9b..80341dfb2c50 100644
--- a/Makefile
+++ b/Makefile
@@ -87,10 +87,12 @@ endif
87ifneq ($(filter 4.%,$(MAKE_VERSION)),) # make-4 87ifneq ($(filter 4.%,$(MAKE_VERSION)),) # make-4
88ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),) 88ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),)
89 quiet=silent_ 89 quiet=silent_
90 tools_silent=s
90endif 91endif
91else # make-3.8x 92else # make-3.8x
92ifneq ($(filter s% -s%,$(MAKEFLAGS)),) 93ifneq ($(filter s% -s%,$(MAKEFLAGS)),)
93 quiet=silent_ 94 quiet=silent_
95 tools_silent=-s
94endif 96endif
95endif 97endif
96 98
@@ -1607,11 +1609,11 @@ image_name:
1607# Clear a bunch of variables before executing the submake 1609# Clear a bunch of variables before executing the submake
1608tools/: FORCE 1610tools/: FORCE
1609 $(Q)mkdir -p $(objtree)/tools 1611 $(Q)mkdir -p $(objtree)/tools
1610 $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/ 1612 $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/
1611 1613
1612tools/%: FORCE 1614tools/%: FORCE
1613 $(Q)mkdir -p $(objtree)/tools 1615 $(Q)mkdir -p $(objtree)/tools
1614 $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/ $* 1616 $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/ $*
1615 1617
1616# Single targets 1618# Single targets
1617# --------------------------------------------------------------------------- 1619# ---------------------------------------------------------------------------