Commit d51bfb78 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

kbuild: introduce escsq to escapre single quotes 



This makes things a little bit more reader friendly and gvim is less
confused.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 37193147

scripts/Kbuild.include

+9 −4
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


# Convinient variables

comma   := ,

squote  := '

empty   :=

space   := $(empty) $(empty)
@@ -11,6 +12,10 @@ space := $(empty) $(empty) 
# contain a comma

depfile = $(subst $(comma),_,$(@D)/.$(@F).d)



###

# Escape single quote for use in echo statements

escsq = $(subst $(squote),'\$(squote)',$1)



###

# filechk is used to check if the content of a generated file is updated.

# Sample usage:
@@ -47,7 +52,7 @@ build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj 


# If quiet is set, only print short version of command

cmd = @$(if $($(quiet)cmd_$(1)),\

      echo '  $(subst ','\'',$($(quiet)cmd_$(1)))' &&) $(cmd_$(1))

      echo '  $(call escsq,$($(quiet)cmd_$(1)))' &&) $(cmd_$(1))



# Add $(obj)/ for paths that is not absolute

objectify = $(foreach o,$(1),$(if $(filter /%,$(o)),$(o),$(obj)/$(o)))
@@ -68,7 +73,7 @@ endif 


# echo command. Short version is $(quiet) equals quiet, otherwise full command

echo-cmd = $(if $($(quiet)cmd_$(1)), \

	echo '  $(subst ','\'',$($(quiet)cmd_$(1)))';)

	echo '  $(call escsq,$($(quiet)cmd_$(1)))';)



# function to only execute the passed command if necessary

# >'< substitution is for echo to work, >$< substitution to preserve $ when reloading .cmd file
@@ -78,7 +83,7 @@ if_changed = $(if $(strip $? $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ), \ 
	@set -e; \

	$(echo-cmd) \

	$(cmd_$(1)); \

	echo 'cmd_$@ := $(subst $$,$$$$,$(subst ','\'',$(cmd_$(1))))' > $(@D)/.$(@F).cmd)

	echo 'cmd_$@ := $(subst $$,$$$$,$(call escsq,$(cmd_$(1))))' > $(@D)/.$(@F).cmd)



# execute the command and also postprocess generated .d dependencies

# file
@@ -87,7 +92,7 @@ if_changed_dep = $(if $(strip $? $(filter-out FORCE $(wildcard $^),$^)\ 
	@set -e; \

	$(echo-cmd) \

	$(cmd_$(1)); \

	scripts/basic/fixdep $(depfile) $@ '$(subst $$,$$$$,$(subst ','\'',$(cmd_$(1))))' > $(@D)/.$(@F).tmp; \

	scripts/basic/fixdep $(depfile) $@ '$(subst $$,$$$$,$(call escsq,$(cmd_$(1))))' > $(@D)/.$(@F).tmp; \

	rm -f $(depfile); \

	mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd)

scripts/Makefile.build

+2 −2
Original line number Diff line number Diff line
@@ -179,10 +179,10 @@ endif 
define rule_cc_o_c

	$(if $($(quiet)cmd_checksrc),echo '  $($(quiet)cmd_checksrc)';)   \

	$(cmd_checksrc)							  \

	$(if $($(quiet)cmd_cc_o_c),echo '  $(subst ','\'',$($(quiet)cmd_cc_o_c))';)  \

	$(if $($(quiet)cmd_cc_o_c),echo '  $(call escsq,$($(quiet)cmd_cc_o_c))';)  \

	$(cmd_cc_o_c);							  \

	$(cmd_modversions)						  \

	scripts/basic/fixdep $(depfile) $@ '$(subst ','\'',$(cmd_cc_o_c))' > $(@D)/.$(@F).tmp;  \

	scripts/basic/fixdep $(depfile) $@ '$(call escsq,$(cmd_cc_o_c))' > $(@D)/.$(@F).tmp;  \

	rm -f $(depfile);						  \

	mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd

endef