summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorAdrien Mazarguil <adrien.mazarguil@6wind.com>2013-11-15 15:38:52 +0100
committerThomas Monjalon <thomas.monjalon@6wind.com>2014-01-15 18:08:43 +0100
commitda776f85eeabced81c5595824c18089d145d2959 (patch)
treea0cb350155e4679690664ce111ebb2722d339b73 /mk
parent3297c985823c741ae764d899c5c21350364302bc (diff)
downloaddpdk-da776f85eeabced81c5595824c18089d145d2959.zip
dpdk-da776f85eeabced81c5595824c18089d145d2959.tar.gz
dpdk-da776f85eeabced81c5595824c18089d145d2959.tar.xz
mk: fix command-line dependency check for quoted strings
Before recompiling a file, rte.compile-pre.mk checks whether the command line is different from the previous one. This is done by storing for each object file the entire command line in a kind of dependency file with a .cmd extension (see obj2cmd). If that file exists, the line is retrieved first and compared against $(C_TO_O_STR). The object file gets recompiled if the file doesn't exist or if the line is different. The problem is that sometimes, files are recompiled for no apparent reason. The check doesn't work properly when a command line contains double-quoted strings such as -DFOO='"bar"' because the shell interprets and strips them. This is fixed by protecting C_TO_O_CMD with simple quotes, knowing that such quotes are already escaped in C_TO_O_STR. Moreover, because simple quotes are escaped in C_TO_O_STR, the retrieved command should be compared against C_TO_O instead. Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com> Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
Diffstat (limited to 'mk')
-rw-r--r--mk/internal/rte.compile-pre.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/internal/rte.compile-pre.mk b/mk/internal/rte.compile-pre.mk
index ab9a4a8..67454d6 100644
--- a/mk/internal/rte.compile-pre.mk
+++ b/mk/internal/rte.compile-pre.mk
@@ -84,7 +84,7 @@ C_TO_O = $(CC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(CFLAGS) \
C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight
C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," CC $(@)")
endif
-C_TO_O_CMD = "cmd_$@ = $(C_TO_O_STR)"
+C_TO_O_CMD = 'cmd_$@ = $(C_TO_O_STR)'
C_TO_O_DO = @set -e; \
echo $(C_TO_O_DISP); \
$(C_TO_O) && \
@@ -99,7 +99,7 @@ compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1)))
file_missing = $(call compare,$(wildcard $@),$@)
# return a non-empty string if cmdline changed
-cmdline_changed = $(call compare,$(cmd_$@),$(1))
+cmdline_changed = $(call compare,$(strip $(cmd_$@)),$(strip $(1)))
# return a non-empty string if a dependency file does not exist
depfile_missing = $(call compare,$(wildcard $(dep_$@)),$(dep_$@))
@@ -127,12 +127,12 @@ boolean = $(if $1,1,0)
$(if $(D),\
@echo -n "$< -> $@ " ; \
echo -n "file_missing=$(call boolean,$(file_missing)) " ; \
- echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(C_TO_O_STR))) " ; \
+ echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(C_TO_O))) " ; \
echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \
echo "depfile_newer=$(call boolean,$(depfile_newer))")
$(if $(or \
$(file_missing),\
- $(call cmdline_changed,$(C_TO_O_STR)),\
+ $(call cmdline_changed,$(C_TO_O)),\
$(depfile_missing),\
$(depfile_newer)),\
$(C_TO_O_DO))