summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorEmil Medve <Emilian.Medve@Freescale.com>2014-01-06 08:58:40 (GMT)
committerEmil Medve <Emilian.Medve@Freescale.com>2014-01-06 17:52:15 (GMT)
commitbfeb679cb365be68e9c2039b4c9634bec90c1897 (patch)
tree470ad13de987ebc0072b6e02b01186bc545cd68a /Makefile
parentaa0d013a113d00ef9cedf03dc34f678311ec028a (diff)
downloadlinux-fsl-qoriq-bfeb679cb365be68e9c2039b4c9634bec90c1897.tar.xz
kbuild: Fix silent builds with make-4
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> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 890392f..1a77cb1 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