summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorYicheng Li <yichengli@chromium.org>2019-12-03 15:27:16 -0800
committerCommit Bot <commit-bot@chromium.org>2019-12-06 23:48:35 +0000
commitdc65233ded51803c54b72bdb137ef0685f2e43a8 (patch)
tree73d24bd1444a723a987864e263cd96837644f155 /common
parent5046ee81f5eb35330615b54f0486f4f052ef8a62 (diff)
downloadchrome-ec-dc65233ded51803c54b72bdb137ef0685f2e43a8.tar.gz
chip/host: Avoid concurrent recipes of libcryptoc.astabilize-12748.B-cr50_stab
CONFIG_DCRYPTO compiles and links thirdparty/libcryptoc for cr50. CONFIG_LIBCRYPTOC does similar things for other boards that configures it, including host. This resulted in cr50_fuzz having concurrent recipes for libcryptoc, as it has both configs. This change separates CONFIG_DCRYPTO from the responsibility of building and linking libcryptoc. Libcryptoc is now solely handles by CONFIG_LIBCRYPTOC. BRANCH=none BUG=b:144811298 TEST=make -j buildall > /dev/null Observed no more "warning: overriding recipe for target 'build/host/cr50_fuzz/cryptoc/libcryptoc.a' " Change-Id: I2186cbead773629456da254df5f82b96e9646fc2 Signed-off-by: Yicheng Li <yichengli@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1949554 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> (cherry picked from commit a018043265ecb3466863ff9020ab25d552105c61) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1956404 Tested-by: Vadim Bendebury <vbendeb@chromium.org> Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/build.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/common/build.mk b/common/build.mk
index 7ee4e102a4..4aa8dc3abd 100644
--- a/common/build.mk
+++ b/common/build.mk
@@ -250,6 +250,7 @@ $(out)/rma_key_from_blob.h: board/$(BOARD)/$(BLOB_FILE) util/bin2h.sh
endif
+# Build and link against libcryptoc.
ifeq ($(CONFIG_LIBCRYPTOC),y)
CRYPTOCLIB := $(realpath ../../third_party/cryptoc)
ifneq ($(BOARD),host)