kbuild: consolidate command line escaping

While the recent change to also escape # symbols when storing C-file
compilation command lines was helpful, it should be in effect for all
command lines, as much as the dollar escaping should be in effect for
C-source compilation commands. Additionally, for better readability and
maintenance, consolidating all the escaping (single quotes, dollars,
and now sharps) was also desirable.

Signed-Off-By: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

1 files changed, 3 insertions, 5 deletions

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 2737765f2fb4..6ac96ea92bfc 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -178,12 +178,10 @@ cmd_modversions =							\
 endif
 
 define rule_cc_o_c
-        $(if $($(quiet)cmd_checksrc),echo '  $($(quiet)cmd_checksrc)';)   \
-        $(cmd_checksrc)                                                   \
-        $(if $($(quiet)cmd_cc_o_c),echo '  $(call escsq,$($(quiet)cmd_cc_o_c))';)  \
-        $(cmd_cc_o_c);                                                    \
+        $(call echo-cmd,checksrc) $(cmd_checksrc)                         \
+        $(call echo-cmd,cc_o_c) $(cmd_cc_o_c);                            \
         $(cmd_modversions)                                                \
-        scripts/basic/fixdep $(depfile) $@ '$(call escsq,$(cmd_cc_o_c))' > $(@D)/.$(@F).tmp;  \
+        scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' > $(@D)/.$(@F).tmp;  \
         rm -f $(depfile);                                                 \
         mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd
 endef