summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbe Levkoy <alevkoy@chromium.org>2022-07-19 16:24:41 -0600
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-07-19 23:49:38 +0000
commit726707640938b7fe5d0bf7a538976543fa7aaf01 (patch)
treec2de60776c2aeed0341ac9fd48c7eb8e00542d98
parent4543627bb156ab51f0130b4ecc2032f49530e29c (diff)
downloadchrome-ec-726707640938b7fe5d0bf7a538976543fa7aaf01.tar.gz
zmake: Pass USER_CACHE_DIR to cmake
When invoking cmake, set USER_CACHE_DIR to build/zephyr/user-cache. Thereby prevent the Zephyr cmake logic from choosing its own location based on the environment and ensure that deleting build/ deletes the cache. BUG=b:239619222 TEST=zmake -D configure test-drivers; observe cache dir output BRANCH=none Signed-off-by: Abe Levkoy <alevkoy@chromium.org> Change-Id: I6baccd61d18c17c843336c5dc0435645b44c0ef4 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3773321 Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
-rw-r--r--zephyr/zmake/zmake/zmake.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/zephyr/zmake/zmake/zmake.py b/zephyr/zmake/zmake/zmake.py
index 71fef5f16b..3ccda6d7cd 100644
--- a/zephyr/zmake/zmake/zmake.py
+++ b/zephyr/zmake/zmake/zmake.py
@@ -467,6 +467,9 @@ class Zmake:
"SYSCALL_INCLUDE_DIRS": str(
self.module_paths["ec"] / "zephyr" / "include" / "drivers"
),
+ "USER_CACHE_DIR": str(
+ self.module_paths["ec"] / "build" / "zephyr" / "user-cache"
+ ),
"ZMAKE_INCLUDE_DIR": str(generated_include_dir),
"ZMAKE_PROJECT_NAME": project.config.project_name,
},