67 lines
2.2 KiB
Diff
67 lines
2.2 KiB
Diff
From a593a3baa44cbfbeb11f0cc3c2a921688fdf09b0 Mon Sep 17 00:00:00 2001
|
|
From: Jiri Olsa <jolsa@kernel.org>
|
|
Date: Sun, 8 Oct 2023 23:22:50 +0200
|
|
Subject: [PATCH 1/3] tools/build: Fix -s detection code in
|
|
tools/build/Makefile.build
|
|
|
|
As Dmitry described in [1] changelog the current way of detecting
|
|
-s option is broken for new make.
|
|
|
|
Changing the tools/build -s option detection the same way as it was
|
|
fixed for root Makefile in [1].
|
|
|
|
[1] 4bf73588165b ("kbuild: Port silent mode detection to future gnu make.")
|
|
|
|
Cc: Dmitry Goncharov <dgoncharov@users.sf.net>
|
|
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
|
|
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Acked-by: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
|
|
Cc: KP Singh <kpsingh@chromium.org>
|
|
Cc: Martin KaFai Lau <kafai@fb.com>
|
|
Cc: Song Liu <songliubraving@fb.com>
|
|
Cc: Yonghong Song <yhs@fb.com>
|
|
Cc: John Fastabend <john.fastabend@gmail.com>
|
|
Cc: Hao Luo <haoluo@google.com>
|
|
Cc: Ian Rogers <irogers@google.com>
|
|
Cc: Stanislav Fomichev <sdf@google.com>
|
|
Cc: Daniel Borkmann <daniel@iogearbox.net>
|
|
Cc: Quentin Monnet <quentin@isovalent.com>
|
|
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
|
|
Cc: Andrii Nakryiko <andrii@kernel.org>
|
|
Cc: Alexei Starovoitov <ast@kernel.org>
|
|
Cc: Ingo Molnar <mingo@kernel.org>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: bpf@vger.kernel.org
|
|
Cc: linux-perf-users@vger.kernel.org
|
|
Link: https://lore.kernel.org/r/20231008212251.236023-2-jolsa@kernel.org
|
|
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
|
|
---
|
|
tools/build/Makefile.build | 10 +++++++++-
|
|
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build
|
|
index fac42486a8cf0..5fb3fb3d97e0f 100644
|
|
--- a/tools/build/Makefile.build
|
|
+++ b/tools/build/Makefile.build
|
|
@@ -20,7 +20,15 @@ else
|
|
Q=@
|
|
endif
|
|
|
|
-ifneq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),)
|
|
+# If the user is running make -s (silent mode), suppress echoing of commands
|
|
+# make-4.0 (and later) keep single letter options in the 1st word of MAKEFLAGS.
|
|
+ifeq ($(filter 3.%,$(MAKE_VERSION)),)
|
|
+short-opts := $(firstword -$(MAKEFLAGS))
|
|
+else
|
|
+short-opts := $(filter-out --%,$(MAKEFLAGS))
|
|
+endif
|
|
+
|
|
+ifneq ($(findstring s,$(short-opts)),)
|
|
quiet=silent_
|
|
endif
|
|
|
|
--
|
|
2.48.1
|
|
|