Message ID | 1388998720-3037-1-git-send-email-Emilian.Medve@Freescale.com (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Michal Marek |
Headers | show |
On Mon, Jan 06, 2014 at 02:58:40AM -0600, 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> > --- > > v2: Avoid false positives as per Michal's (Marek) feedback Thanks, applied to kbuild.git#kbuild. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Makefile b/Makefile index ae1a55a..5d3c303 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 ,$(firstword x$(MAKEFLAGS))),) + quiet=silent_ +endif +else # make-3.8x ifneq ($(filter s% -s%,$(MAKEFLAGS)),) quiet=silent_ endif +endif export quiet Q KBUILD_VERBOSE
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> --- v2: Avoid false positives as per Michal's (Marek) feedback Makefile | 6 ++++++ 1 file changed, 6 insertions(+)