diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-07-30 11:15:13 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-07-30 11:15:13 +0200 |
commit | f5db340f19f14a8df9dfd22d71fba1513e9f1f7e (patch) | |
tree | 131d3345bc987aee3c922624de816492e7f323a4 /tools/build | |
parent | Merge tag 'perf-core-for-mingo-4.14-20170725' of git://git.kernel.org/pub/scm... (diff) | |
parent | kprobes/x86: Release insn_slot in failure path (diff) | |
download | linux-f5db340f19f14a8df9dfd22d71fba1513e9f1f7e.tar.xz linux-f5db340f19f14a8df9dfd22d71fba1513e9f1f7e.zip |
Merge branch 'perf/urgent' into perf/core, to pick up latest fixes and refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/build')
-rw-r--r-- | tools/build/Makefile.build | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build index e279a71c650d..c46b20e4ad87 100644 --- a/tools/build/Makefile.build +++ b/tools/build/Makefile.build @@ -19,15 +19,9 @@ else Q=@ endif -ifneq ($(filter 4.%,$(MAKE_VERSION)),) # make-4 -ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),) +ifneq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),) quiet=silent_ endif -else # make-3.8x -ifneq ($(filter s% -s%,$(MAKEFLAGS)),) - quiet=silent_ -endif -endif build-dir := $(srctree)/tools/build |