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

Configure Feed

Select the types of activity you want to include in your feed.

kbuild: Port silent mode detection to future gnu make.

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
https://www.gnu.org/software/make/manual/make.html#Testing-Flags.

Link: https://lists.gnu.org/archive/html/bug-make/2022-11/msg00190.html
Reported-by: Jan Palus <jpalus+gnu@fastmail.com>
Signed-off-by: Dmitry Goncharov <dgoncharov@users.sf.net>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

authored by

Dmitry Goncharov and committed by
Masahiro Yamada
4bf73588 9edb4fd3

+10 -3
+10 -3
Makefile
··· 93 93 94 94 # If the user is running make -s (silent mode), suppress echoing of 95 95 # commands 96 + # make-4.0 (and later) keep single letter options in the 1st word of MAKEFLAGS. 96 97 97 - ifneq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),) 98 - quiet=silent_ 99 - KBUILD_VERBOSE = 0 98 + ifeq ($(filter 3.%,$(MAKE_VERSION)),) 99 + silence:=$(findstring s,$(firstword -$(MAKEFLAGS))) 100 + else 101 + silence:=$(findstring s,$(filter-out --%,$(MAKEFLAGS))) 102 + endif 103 + 104 + ifeq ($(silence),s) 105 + quiet=silent_ 106 + KBUILD_VERBOSE = 0 100 107 endif 101 108 102 109 export quiet Q KBUILD_VERBOSE