diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-07-30 05:15:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-07-30 05:15:13 -0400 |
| commit | f5db340f19f14a8df9dfd22d71fba1513e9f1f7e (patch) | |
| tree | 131d3345bc987aee3c922624de816492e7f323a4 /tools/build | |
| parent | ee438ec8f33c5af0d4a4ffb935c5b9272e8c2680 (diff) | |
| parent | 38115f2f8cec8087d558c062e779c443a01f87d6 (diff) | |
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 | |||
| 19 | Q=@ | 19 | Q=@ |
| 20 | endif | 20 | endif |
| 21 | 21 | ||
| 22 | ifneq ($(filter 4.%,$(MAKE_VERSION)),) # make-4 | 22 | ifneq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),) |
| 23 | ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),) | ||
| 24 | quiet=silent_ | 23 | quiet=silent_ |
| 25 | endif | 24 | endif |
| 26 | else # make-3.8x | ||
| 27 | ifneq ($(filter s% -s%,$(MAKEFLAGS)),) | ||
| 28 | quiet=silent_ | ||
| 29 | endif | ||
| 30 | endif | ||
| 31 | 25 | ||
| 32 | build-dir := $(srctree)/tools/build | 26 | build-dir := $(srctree)/tools/build |
| 33 | 27 | ||