X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile;h=a162f6cdf77c6bd8c9ab1f8c45a31a3ba05f0d8f;hb=543aff194ab6286af7791c5a138978ee7da4c93f;hp=3778b422fa113b0de2c25ea182e4acaef6f1ef8a;hpb=68a95455c153f8adc513e5b688f4b348daa7c1b1;p=platform%2Fkernel%2Flinux-starfive.git

diff --git a/Makefile b/Makefile
index 3778b42..a162f6cd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 6
 PATCHLEVEL = 1
-SUBLEVEL = 9
+SUBLEVEL = 23
 EXTRAVERSION =
 NAME = Hurr durr I'ma ninja sloth
 
@@ -93,10 +93,17 @@ endif
 
 # 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.
 
-ifneq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),)
-  quiet=silent_
-  KBUILD_VERBOSE = 0
+ifeq ($(filter 3.%,$(MAKE_VERSION)),)
+silence:=$(findstring s,$(firstword -$(MAKEFLAGS)))
+else
+silence:=$(findstring s,$(filter-out --%,$(MAKEFLAGS)))
+endif
+
+ifeq ($(silence),s)
+quiet=silent_
+KBUILD_VERBOSE = 0
 endif
 
 export quiet Q KBUILD_VERBOSE