summaryrefslogtreecommitdiff
path: root/zephyr
diff options
context:
space:
mode:
authorKeith Short <keithshort@chromium.org>2021-05-14 14:37:04 -0600
committerCommit Bot <commit-bot@chromium.org>2021-05-17 20:14:55 +0000
commite0c3fcb2ab4e85fb6202767f44f3ce0d248183e4 (patch)
treef4c1aa59c3d2bbdcc3655bbd9662d9283d83199d /zephyr
parent49c22349759369c6736169386d3d5e66e1e7400d (diff)
downloadchrome-ec-e0c3fcb2ab4e85fb6202767f44f3ce0d248183e4.tar.gz
zephyr: Fix EC version depedendency
Add an explicit dependency between the generated ec_version.h file and the app library. This ensures the version header file is created before compiling the app library. BUG=b:188439971 BRANCH=none TEST=zmake testall Signed-off-by: Keith Short <keithshort@chromium.org> Change-Id: I5876939b76ffcf5691f40f59b39a1e02a8314ebb Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2896933 Commit-Queue: Jeremy Bettis <jbettis@chromium.org> Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Diffstat (limited to 'zephyr')
-rw-r--r--zephyr/CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index cea08e2ed6..2ce9b6e4b6 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -43,6 +43,10 @@ if(DEFINED CONFIG_PLATFORM_EC)
add_library(ec_version INTERFACE)
add_dependencies(ec_version generate_ec_version)
+ # Ensure the EC version file is generated before trying to build the app
+ # library, which includes compiling version.c
+ add_dependencies(app ec_version)
+
# Register the library with zephyr so that it generates the file at build
# time. Also, append the include directory so we can include ec_version.h.
zephyr_append_cmake_library(ec_version)