summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Bendebury <vbendeb@chromium.org>2018-03-22 16:46:17 -0700
committerchrome-bot <chrome-bot@chromium.org>2018-03-23 12:10:15 -0700
commitc3e92e92bb6194f6bed5778d0d62735beaa946d6 (patch)
tree1608aefd5c13e049ba243e2562cf1f8106f5349c
parent4d959e92cab7d26733f5a0379f1afeed42a0c7a5 (diff)
downloadchrome-ec-c3e92e92bb6194f6bed5778d0d62735beaa946d6.tar.gz
makefile: fix build time warnings
Recently, when building images for Cr50 the following warnings started being generated by make: board/cr50/build.mk:98: warning: overriding recipe for target \ 'build/cr50/tpm2/libtpm2.a' board/cr50/build.mk:98: warning: ignoring old recipe for target \ 'build/cr50/tpm2/libtpm2.a' The reason for this turned out to be changes under https://chromium-review.googlesource.com/954444 Let's make sure specific make file is not included in the build twice. BRANCH=cr50, cr50-mp BUG=none TEST='make buildall -j' succeeded. Verified that there is no warnings reported in the make output. Change-Id: I96924752eb91669957d2b514d8926ac843b2bf93 Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/977021 Reviewed-by: Aseda Aboagye <aaboagye@chromium.org> Reviewed-by: Furquan Shaikh <furquan@chromium.org> Reviewed-by: Jett Rink <jettrink@chromium.org>
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 5c311a0640..e1ba98270d 100644
--- a/Makefile
+++ b/Makefile
@@ -182,7 +182,9 @@ ifdef CTS_MODULE
include cts/build.mk
endif
include $(BASEDIR)/build.mk
+ifneq ($(BASEDIR),$(BDIR))
include $(BDIR)/build.mk
+endif
include chip/$(CHIP)/build.mk
include core/$(CORE)/build.mk
include common/build.mk