Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jiri Olsa and committed by
Namhyung Kim
d9997f7f 9a13ee45

+9 -1
+9 -1
tools/build/Makefile.build
··· 20 20 Q=@ 21 21 endif 22 22 23 - ifneq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),) 23 + # If the user is running make -s (silent mode), suppress echoing of commands 24 + # make-4.0 (and later) keep single letter options in the 1st word of MAKEFLAGS. 25 + ifeq ($(filter 3.%,$(MAKE_VERSION)),) 26 + short-opts := $(firstword -$(MAKEFLAGS)) 27 + else 28 + short-opts := $(filter-out --%,$(MAKEFLAGS)) 29 + endif 30 + 31 + ifneq ($(findstring s,$(short-opts)),) 24 32 quiet=silent_ 25 33 endif 26 34