From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: linux-kbuild@vger.kernel.org
Cc: Sam Ravnborg <sam@ravnborg.org>,
Nicolas Pitre <nicolas.pitre@linaro.org>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Michal Marek <michal.lkml@markovi.net>,
linux-kernel@vger.kernel.org
Subject: [PATCH 7/8] kbuild: refactor if_changed and if_changed_dep
Date: Thu, 15 Nov 2018 17:27:14 +0900 [thread overview]
Message-ID: <1542270435-11181-8-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1542270435-11181-1-git-send-email-yamada.masahiro@socionext.com>
'@set -e; $(echo-cmd) $(cmd_$(1)' can be replaced with '$(cmd)'.
More cleanups.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
scripts/Kbuild.include | 9 +++------
scripts/Makefile.build | 4 ++--
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 5e47bf6..e4b77ef7 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -251,17 +251,14 @@ any-prereq = $(filter-out $(PHONY),$?) $(filter-out $(PHONY) $(wildcard $^),$^)
# Execute command if command has changed or prerequisite(s) are updated.
if_changed = $(if $(strip $(any-prereq) $(arg-check)), \
- @set -e; \
- $(echo-cmd) $(cmd_$(1)); \
+ $(cmd); \
printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd, @:)
# Execute the command and also postprocess generated .d dependencies file.
-if_changed_dep = $(if $(strip $(any-prereq) $(arg-check) ), \
- @set -e; \
- $(cmd_and_fixdep), @:)
+if_changed_dep = $(if $(strip $(any-prereq) $(arg-check)), $(cmd_and_fixdep), @:)
cmd_and_fixdep = \
- $(echo-cmd) $(cmd_$(1)); \
+ $(cmd); \
scripts/basic/fixdep $(depfile) $@ '$(make-cmd)' > $(dot-target).tmp;\
rm -f $(depfile); \
mv -f $(dot-target).tmp $(dot-target).cmd;
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 78e647f..0f28df2 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -264,7 +264,7 @@ endif
define rule_cc_o_c
$(call cmd,checksrc)
- @$(call cmd_and_fixdep,cc_o_c)
+ $(call cmd_and_fixdep,cc_o_c)
$(call cmd,gen_ksymdeps)
$(call cmd,checkdoc)
$(call cmd,objtool)
@@ -273,7 +273,7 @@ define rule_cc_o_c
endef
define rule_as_o_S
- @$(call cmd_and_fixdep,as_o_S)
+ $(call cmd_and_fixdep,as_o_S)
$(call cmd,gen_ksymdeps)
$(call cmd,objtool)
$(call cmd,modversions_S)
--
2.7.4
next prev parent reply other threads:[~2018-11-15 8:28 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-15 8:27 [PATCH 0/8] kbuild: clean-up modversion, TRIM_UNUSED_KSYMS, if_changed_rule, etc Masahiro Yamada
2018-11-15 8:27 ` [PATCH 1/8] kbuild: remove redundant 'set -e' from filechk_* defines Masahiro Yamada
2018-11-15 8:27 ` [PATCH 2/8] kbuild: remove redundant 'set -e' from sub_cmd_record_mcount Masahiro Yamada
2018-11-15 8:27 ` [PATCH 3/8] kbuild: refactor modversions build rules Masahiro Yamada
2018-11-16 20:01 ` Sam Ravnborg
2018-11-18 5:00 ` Masahiro Yamada
2018-11-15 8:27 ` [PATCH 4/8] kbuild: simplify dependency generation for CONFIG_TRIM_UNUSED_KSYMS Masahiro Yamada
2018-11-16 5:13 ` Nicolas Pitre
2018-11-16 7:13 ` Masahiro Yamada
2018-11-16 17:49 ` Nicolas Pitre
2018-11-20 1:13 ` Masahiro Yamada
2018-11-15 8:27 ` [PATCH 5/8] kbuild: change if_changed_rule to accept multi-line recipe Masahiro Yamada
2018-11-15 9:12 ` Rasmus Villemoes
2018-11-16 1:37 ` Masahiro Yamada
2018-11-15 8:27 ` [PATCH 6/8] kbuild: remove trailing semicolon from cmd_* passed to if_changed_rule Masahiro Yamada
2018-11-15 8:27 ` Masahiro Yamada [this message]
2018-11-15 8:27 ` [PATCH 8/8] kbuild: remove redundant 'set -e' from cmd_* defines Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1542270435-11181-8-git-send-email-yamada.masahiro@socionext.com \
--to=yamada.masahiro@socionext.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=michal.lkml@markovi.net \
--cc=nicolas.pitre@linaro.org \
--cc=sam@ravnborg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).