Build: fix silent mode with make 3.8x

With make 3.8x, in case of 'make all -s -w', MAKEFLAGS equals 'ws' This patch correctly catches the flag 's' Reviewed-by: Jerome Forissier <[email protected]> Reviewed-by: Jens Wiklander <[email protected]> Signed-off-by: Pascal Brand <[email protected]>
dgarske · May 29, 2015 · 3dc79b0 · 3dc79b0
1 parent c974c7d
commit 3dc79b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -46,7 +46,7 @@ ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),)
 cmd-echo-silent := true
 endif
 else                                    # make-3.8x
-ifneq ($(filter s% -s%,$(MAKEFLAGS)),)
+ifneq ($(findstring s, $(MAKEFLAGS)),)
 cmd-echo-silent := true
 endif
 endif

diff --git a/ta/mk/ta_dev_kit.mk b/ta/mk/ta_dev_kit.mk
@@ -34,7 +34,7 @@ ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),)
 cmd-echo-silent := true
 endif
 else                                    # make-3.8x
-ifneq ($(filter s% -s%,$(MAKEFLAGS)),)
+ifneq ($(findstring s, $(MAKEFLAGS)),)
 cmd-echo-silent := true
 endif
 endif