aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-10-09 10:25:22 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-10-09 10:25:22 +0000
commit5112afe6578ea65a8afe84bbc99b198afba2f9c2 (patch)
tree3048c07aee1ef2f7b4ef1cf8836b938078b3f104
parente58de93cdbcdbc42dcc821853027cff10d974db1 (diff)
parentc91284dcd8ade4546375537e24bfee430d63b740 (diff)
downloadbuild-5112afe6578ea65a8afe84bbc99b198afba2f9c2.tar.gz
Merge "Build System: Ignore copies in copy-many-files if src == dst"
-rw-r--r--core/definitions.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/definitions.mk b/core/definitions.mk
index b57813491d..0347157030 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2481,7 +2481,8 @@ $(foreach f, $(1), $(strip \
$(eval _cmf_tuple := $(subst :, ,$(f))) \
$(eval _cmf_src := $(word 1,$(_cmf_tuple))) \
$(eval _cmf_dest := $(word 2,$(_cmf_tuple))) \
- $(eval $(call copy-one-file,$(_cmf_src),$(_cmf_dest))) \
+ $(if $(filter-out $(_cmf_src), $(_cmf_dest)), \
+ $(eval $(call copy-one-file,$(_cmf_src),$(_cmf_dest)))) \
$(_cmf_dest)))
endef