Merge remote-tracking branch 'drm-intel/for-linux-next'

[karo-tx-linux.git] / Makefile

diff --git a/Makefile b/Makefile
index eeec740776f3548d2ffa871b52d34a881e2f77e4..073055d536233d0cd88466ad1253596afce4f62e 100644 (file)
--- 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