Re: [PATCH] kbuild: Fix silent builds with make-4

[Michal Marek]

On 2013-12-05 22:56, Emil Medve wrote:
> make-4 changed the way/order it presents the command line options
> into MAKEFLAGS
> 
> In make-3.8x, '-s' would always be first into a group of options
> with the '-'/hyphen removed
> 
> $ make -p -s 2>/dev/null | grep ^MAKEFLAGS
> MAKEFLAGS = sp
> 
> In make-4, '-s' seems to always be last into a group of options
> with the '-'/hyphen removed
> 
> $ make -s -p 2>/dev/null | grep ^MAKEFLAGS
> MAKEFLAGS = ps
> 
> Signed-off-by: Emil Medve <Emilian.Medve@xxxxxxxxxxxxx>
> ---
>  Makefile | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/Makefile b/Makefile
> index 2c88e44..0332949 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -311,9 +311,15 @@ endif
>  # If the user is running make -s (silent mode), suppress echoing of
>  # commands
>  
> +ifneq ($(filter 4.%,$(MAKE_VERSION)),)	# make-4
> +ifneq ($(filter %s -s%,$(MAKEFLAGS)),)

The -s% here is unnecessary for two reasons: as you say, s is always at
the end with make 4, and even if a long option is used, the hyphen is
omitted:

3.82:
$ make -s -p --no-print-directory | grep MAKEFLAGS
MAKEFLAGS =  --no-print-directory -sp
$ ./make/make -s -p --no-print-directory | grep MAKEFLAGS
GNUMAKEFLAGS :=
MAKEFLAGS = ps --no-print-directory

And according to
http://git.savannah.gnu.org/cgit/make.git/commit/?id=a674abe702cc0c017209a3186c32df050ff21f41,
the space character is always there, even if there are no single-letter
options. So we can do something like

ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),)

and avoid accidentally matching things like --debug=jobs. Does the above
work for you?

Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/