lkml.org 
[lkml]   [2014]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] kbuild: Fix silent builds with make-4
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@Freescale.com>
> ---
> 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


\
 
 \ /
  Last update: 2014-01-03 17:41    [W:0.056 / U:1.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site