From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4285E156C6;
	Sun,  8 Oct 2023 21:23:22 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="X0whpVD0"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1A62C433C8;
	Sun,  8 Oct 2023 21:23:17 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1696800202;
	bh=kUN7VH/mH2WUv7jSqF4ucLmh8i+ZTs7Lf4THQj/ZSOo=;
	h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
	b=X0whpVD0SwElL0dKx+tCa/WI2UTaaCs9usakGfM6asVdnvQdOzVpyaRJQVXT30rM1
	 Z97G5ZJ3RvQYD9G0nGosUEEzGcX15yUJVbhu4u8AV3byzKdbGfrjh6pCeCstJmLpty
	 nnjIHxj3ptwZ5X3UUUwNTtEYOZAD8IzYnJp0FFpgktrOO9ah1iDuFOz4Rrl0Gj7fEy
	 EkxiPViOMAn2v34jQyuldQwHQKmKHy7PncKp2TlUT0SyWQeAYgUYQ8BB9em4WojQ4E
	 okGg7rsPLhJ47XwqOZQKT52QAc8EgrwmZXJeCl9pK33JPD87ccF4X9pPET6qYiXBlZ
	 gpYREb4KzOpjw==
From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>,
	Alexei Starovoitov <ast@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Andrii Nakryiko <andrii@kernel.org>,
	Quentin Monnet <quentin@isovalent.com>
Cc: Dmitry Goncharov <dgoncharov@users.sf.net>,
	linux-perf-users@vger.kernel.org,
	bpf@vger.kernel.org,
	Namhyung Kim <namhyung@kernel.org>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Martin KaFai Lau <kafai@fb.com>,
	Song Liu <songliubraving@fb.com>,
	Yonghong Song <yhs@fb.com>,
	John Fastabend <john.fastabend@gmail.com>,
	Ian Rogers <irogers@google.com>,
	KP Singh <kpsingh@chromium.org>,
	Stanislav Fomichev <sdf@google.com>,
	Hao Luo <haoluo@google.com>,
	Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCHv2 2/2] tools/build: Fix -s detection code in tools/scripts/Makefile.include
Date: Sun,  8 Oct 2023 23:22:51 +0200
Message-ID: <20231008212251.236023-3-jolsa@kernel.org>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20231008212251.236023-1-jolsa@kernel.org>
References: <20231008212251.236023-1-jolsa@kernel.org>
Precedence: bulk
X-Mailing-List: linux-perf-users@vger.kernel.org
List-Id: <linux-perf-users.vger.kernel.org>
List-Subscribe: <mailto:linux-perf-users+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-perf-users+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

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>
---
 tools/scripts/Makefile.include | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include
index ff527ac065cf..6fba29f3222d 100644
--- a/tools/scripts/Makefile.include
+++ b/tools/scripts/Makefile.include
@@ -136,7 +136,15 @@ else
 NO_SUBDIR = :
 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)),)
   silent=1
 endif
 
-- 
2.41.0