Commit 164f0d2e authored by Michal Marek's avatar Michal Marek
Browse files

kbuild: Fix handling of backslashes in *.cmd files 



Commit c353acba ("kbuild: make: fix if_changed when command contains
backslashes") attempted to handle backslashes in *.cmd files, but it
only handled double backslashes for some reason. Changing make-cmd to also
handle single backslashes fixes rebuilds with dash, but it breaks bash
again. The reason is that the two shells disagree about the
interpretation of backslash sequences in the echo builtin. The way out
of this is to print the command with printf '%s\n'. While at it,
document what the individual parts of make-cmd do and why.

Reported-and-tested-by: default avatarKonstantin Khlebnikov <koct9i@gmail.com>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 26ea6bb1

scripts/Kbuild.include

+8 −6
Original line number Diff line number Diff line
@@ -215,11 +215,13 @@ else 
arg-check = $(if $(strip $(cmd_$@)),,1)

endif



# >'< substitution is for echo to work,

# >$< substitution to preserve $ when reloading .cmd file

# note: when using inline perl scripts [perl -e '...$$t=1;...']

# in $(cmd_xxx) double $$ your perl vars

make-cmd = $(subst \\,\\\\,$(subst \#,\\\#,$(subst $$,$$$$,$(call escsq,$(cmd_$(1))))))

# Replace >$< with >$$< to preserve $ when reloading the .cmd file

# (needed for make)

# Replace >#< with >\#< to avoid starting a comment in the .cmd file

# (needed for make)

# Replace >'< with >'\''< to be able to enclose the whole string in '...'

# (needed for the shell)

make-cmd = $(call escsq,$(subst \#,\\\#,$(subst $$,$$$$,$(cmd_$(1)))))



# Find any prerequisites that is newer than target or that does not exist.

# PHONY targets skipped in both cases.
@@ -230,7 +232,7 @@ any-prereq = $(filter-out $(PHONY),$?) $(filter-out $(PHONY) $(wildcard $^),$^) 
if_changed = $(if $(strip $(any-prereq) $(arg-check)),                       \

	@set -e;                                                             \

	$(echo-cmd) $(cmd_$(1));                                             \

	echo 'cmd_$@ := $(make-cmd)' > $(dot-target).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) ),                  \

CRA Git | Maintained and supported by SUSTech CRA and CCSE