[PATCH] tools/build: Fix -s detection code for new make

[PATCH] tools/build: Fix -s detection code for new make

[Jiri Olsa]

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

diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build
index fac42486a8cf..5fb3fb3d97e0 100644
--- a/tools/build/Makefile.build
+++ b/tools/build/Makefile.build
@@ -20,7 +20,15 @@ else
   Q=@
 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)),)
   quiet=silent_
 endif
 
-- 
2.41.0

Re: [PATCH] tools/build: Fix -s detection code for new make

[Jiri Olsa]

On Wed, Oct 04, 2023 at 03:59:56PM +0200, Jiri Olsa wrote:
> 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>

we actually need same change in tools/scripts/Makefile.include as well,
I'll resend v2

jirka

> ---
>  tools/build/Makefile.build | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build
> index fac42486a8cf..5fb3fb3d97e0 100644
> --- a/tools/build/Makefile.build
> +++ b/tools/build/Makefile.build
> @@ -20,7 +20,15 @@ else
>    Q=@
>  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)),)
>    quiet=silent_
>  endif
>  
> -- 
> 2.41.0
> 

Re: [PATCH] tools/build: Fix -s detection code for new make

[Arnaldo Carvalho de Melo]

Em Fri, Oct 06, 2023 at 11:27:23PM +0200, Jiri Olsa escreveu:
> On Wed, Oct 04, 2023 at 03:59:56PM +0200, Jiri Olsa wrote:
> > 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>
> 
> we actually need same change in tools/scripts/Makefile.include as well,
> I'll resend v2

Thanks, I noticed the change in behaviour and was gegoing thru other
grep/sed, egrep, NO_LIBTRACEEVENT, binutils not being installed leading
to -1 error in annotation, etc before getting to this, on the way to
judiciously test the new default to BUILD_BPF_SKEL=1.

I did a quick test and got a familiar output when building perf, please
submit v2, v1 is great for me so far :)

- Arnaldo
 
> jirka
> 
> > ---
> >  tools/build/Makefile.build | 10 +++++++++-
> >  1 file changed, 9 insertions(+), 1 deletion(-)
> > 
> > diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build
> > index fac42486a8cf..5fb3fb3d97e0 100644
> > --- a/tools/build/Makefile.build
> > +++ b/tools/build/Makefile.build
> > @@ -20,7 +20,15 @@ else
> >    Q=@
> >  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)),)
> >    quiet=silent_
> >  endif
> >  
> > -- 
> > 2.41.0
> > 

-- 

- Arnaldo