diff options
| author | Craig Hesling <hesling@chromium.org> | 2020-12-15 21:06:57 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-12-24 06:24:53 +0000 |
| commit | 52c5feeef322e014e36596165dcbb8c4c5bc70b6 (patch) | |
| tree | d3af428f937c1929dc1cd0287dfd429c41a2a3ab | |
| parent | 93b67dcad05356b132a63be4a9831932486594db (diff) | |
| download | chrome-ec-52c5feeef322e014e36596165dcbb8c4c5bc70b6.tar.gz | |
make: Rename cryptoc path variable
Clarify that the variable means the directory path vs the library name.
BRANCH=none
BUG=none
TEST=make BOARD=bloonchipper
TEST=# Create a dummy commit
./util/compare_build.sh -b fp
Signed-off-by: Craig Hesling <hesling@chromium.org>
Change-Id: I03a1fe03da678a972091925f61bdfafaec0d4a46
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2593880
Reviewed-by: Yicheng Li <yichengli@chromium.org>
| -rw-r--r-- | third_party/rules.mk | 6 | ||||
| -rwxr-xr-x | util/compare_build.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/third_party/rules.mk b/third_party/rules.mk index b208a3739e..8fcdb76d6c 100644 --- a/third_party/rules.mk +++ b/third_party/rules.mk @@ -10,11 +10,11 @@ # Build and link against libcryptoc. ifeq ($(CONFIG_LIBCRYPTOC),y) -CRYPTOCLIB ?= $(realpath ../../third_party/cryptoc) +CRYPTOC_DIR ?= $(realpath ../../third_party/cryptoc) # SUPPORT_UNALIGNED indicates to libcryptoc that provided data buffers # may be unaligned and please handle them safely. -cmd_libcryptoc_make = $(MAKE) -C $(CRYPTOCLIB) \ +cmd_libcryptoc_make = $(MAKE) -C $(CRYPTOC_DIR) \ obj=$(realpath $(out))/cryptoc \ SUPPORT_UNALIGNED=1 cmd_libcryptoc = $(cmd_libcryptoc_make) -q || $(cmd_libcryptoc_make) @@ -22,7 +22,7 @@ cmd_libcryptoc = $(cmd_libcryptoc_make) -q || $(cmd_libcryptoc_make) ifneq ($(BOARD),host) CPPFLAGS += -I$(abspath ./builtin) endif -CPPFLAGS += -I$(CRYPTOCLIB)/include +CPPFLAGS += -I$(CRYPTOC_DIR)/include CRYPTOC_LDFLAGS := -L$(out)/cryptoc -lcryptoc # Force the external build each time, so it can look for changed sources. diff --git a/util/compare_build.sh b/util/compare_build.sh index ffe6cab0e5..c1e7856f31 100755 --- a/util/compare_build.sh +++ b/util/compare_build.sh @@ -226,7 +226,7 @@ endif build-%: ec-% \$(MAKE) --no-print-directory -C \$(@:build-%=ec-%) \\ STATIC_VERSION=1 \\ - CRYPTOCLIB=\$(CRYPTOC_DIR) \\ + CRYPTOC_DIR=\$(CRYPTOC_DIR) \\ \$(addprefix proj-,\$(BOARDS)) @printf " MKDIR %s\n" "\$@" @mkdir -p \$@ |