summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2012-01-05 16:46:30 -0600
committerMichal Marek <mmarek@suse.cz>2012-01-08 14:20:25 +0100
commite6ac89fabd030704eac691dab7783ebe06e6b2c1 (patch)
treef26c97b74b9bcf35c26925707e187250dfc3d5d0
parent5f7efb4c6da9f90cb306923ced2a6494d065a595 (diff)
kbuild: Correctly deal with make options which contain an "s"
When using remake, which is based on gnumake, if you invoke an example build as shown below, the build will become silent due to the top level make file incorrectly guessing that the end user wants a silent build because an argument that contained an "s" was used. Here are two examples one with remake and one with straight gnumake. remake --no-extended-errors make --warn-undefined-variables Fix up the top level Makefile to use filter to parse the options that mean silent instead of findstring catching other random arguments containing an "s". Signed-off-by: Jason Wessel <jason.wessel@windriver.com> CC: Michal Marek <mmarek@suse.cz> CC: Andrew Morton <akpm@linux-foundation.org> CC: linux-kbuild@vger.kernel.org Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2e78b0800334..a9c1a3b7f1ee 100644
--- a/Makefile
+++ b/Makefile
@@ -312,7 +312,7 @@ endif
# If the user is running make -s (silent mode), suppress echoing of
# commands
-ifneq ($(findstring s,$(MAKEFLAGS)),)
+ifneq ($(filter s% -s%,$(MAKEFLAGS)),)
quiet=silent_
endif