[PATCH master] kbuild: Port silent mode detection to future gnu make.

Ahmad Fatoum a.fatoum at pengutronix.de
Mon Jun 12 05:58:24 PDT 2023

Port silent mode detection to the future (post make-4.4) versions of gnu make.

Makefile contains the following piece of make code to detect if option -s is
specified on the command line.

ifneq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),)

This code is executed by make at parse time and assumes that MAKEFLAGS
does not contain command line variable definitions.
Currently if the user defines a=s on the command line, then at build only
time MAKEFLAGS contains " -- a=s".
However, starting with commit dc2d963989b96161472b2cd38cef5d1f4851ea34
MAKEFLAGS contains command line definitions at both parse time and
build time.

This '-s' detection code then confuses a command line variable
definition which contains letter 's' with option -s.

$ # old make
$ make net/wireless/ocb.o a=s
CALL    scripts/checksyscalls.sh
DESCEND objtool
$ # this a new make which defines makeflags at parse time
$ ~/src/gmake/make/l64/make net/wireless/ocb.o a=s

We can see here that the letter 's' from 'a=s' was confused with -s.

This patch checks for presence of -s using a method recommended by the
make manual here

Link: https://lists.gnu.org/archive/html/bug-make/2022-11/msg00190.html
Reported-by: Jan Palus <jpalus+gnu at fastmail.com>
Signed-off-by: Dmitry Goncharov <dgoncharov at users.sf.net>
Signed-off-by: Masahiro Yamada <masahiroy at kernel.org>
[ported from Linux commit 4bf73588165ba7d32131a043775557a54b6e1db5]
Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
 Makefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index af5c1448b378..1262612675b3 100644
--- a/Makefile
+++ b/Makefile
@@ -90,9 +90,16 @@ endif
 # 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.
-ifneq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),)
-  quiet=silent_
+ifeq ($(filter 3.%,$(MAKE_VERSION)),)
+silence:=$(findstring s,$(firstword -$(MAKEFLAGS)))
+silence:=$(findstring s,$(filter-out --%,$(MAKEFLAGS)))
+ifeq ($(silence),s)
 export quiet Q KBUILD_VERBOSE

More information about the barebox mailing list