From dc65233ded51803c54b72bdb137ef0685f2e43a8 Mon Sep 17 00:00:00 2001 From: Yicheng Li Date: Tue, 3 Dec 2019 15:27:16 -0800 Subject: chip/host: Avoid concurrent recipes of libcryptoc.a 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 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1949554 Reviewed-by: Vadim Bendebury (cherry picked from commit a018043265ecb3466863ff9020ab25d552105c61) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1956404 Tested-by: Vadim Bendebury Commit-Queue: Vadim Bendebury --- chip/host/build.mk | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'chip/host') diff --git a/chip/host/build.mk b/chip/host/build.mk index 12b10dba16..f57fe85502 100644 --- a/chip/host/build.mk +++ b/chip/host/build.mk @@ -28,15 +28,3 @@ chip-$(CONFIG_DCRYPTO)+= dcrypto/sha256.o # Object files that can be shared with the Cr50 dcrypto implementation chip-$(CONFIG_DCRYPTO)+= ../g/dcrypto/hmac.o - -ifeq ($(CONFIG_DCRYPTO),y) -CRYPTOCLIB := $(realpath ../../third_party/cryptoc) - -# Force the external build each time, so it can look for changed sources. -.PHONY: $(out)/cryptoc/libcryptoc.a -$(out)/cryptoc/libcryptoc.a: - $(MAKE) obj=$(realpath $(out))/cryptoc SUPPORT_UNALIGNED=1 \ - CONFIG_UPTO_SHA512=$(CONFIG_UPTO_SHA512) -C $(CRYPTOCLIB) - -CPPFLAGS += -I$(CRYPTOCLIB)/include -endif # end CONFIG_DCRYPTO -- cgit v1.2.1