diff options
| author | Yicheng Li <yichengli@chromium.org> | 2019-12-03 15:27:16 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-12-06 23:48:35 +0000 |
| commit | dc65233ded51803c54b72bdb137ef0685f2e43a8 (patch) | |
| tree | 73d24bd1444a723a987864e263cd96837644f155 /chip/host | |
| parent | 5046ee81f5eb35330615b54f0486f4f052ef8a62 (diff) | |
| download | chrome-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 'chip/host')
| -rw-r--r-- | chip/host/build.mk | 12 |
1 files changed, 0 insertions, 12 deletions
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 |