diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-16 14:34:54 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-16 14:34:54 -0800 |
commit | c63dbbd5268c397f051e0e0f665799ef64a1f3a4 (patch) | |
tree | 3d832ca143858fd601869a1e2dbe553bd513d854 /Makefile | |
parent | 53999bf34d55981328f8ba9def558d3e104d6e36 (diff) | |
parent | 7c43185138cf523b0810ffd2c9e18e2ecb356730 (diff) | |
download | linux-c63dbbd5268c397f051e0e0f665799ef64a1f3a4.tar.gz |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: Kbuild: Use dtc's -d (dependency) option dtc: Implement -d option to write out a dependency file kbuild: Fix comment in Makefile.lib scripts/genksyms: clean lex/yacc generated files kbuild: Correctly deal with make options which contain an "s"
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile index adddd11c3b3b..4b8ae0483768 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 |