From 726707640938b7fe5d0bf7a538976543fa7aaf01 Mon Sep 17 00:00:00 2001 From: Abe Levkoy Date: Tue, 19 Jul 2022 16:24:41 -0600 Subject: 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 Change-Id: I6baccd61d18c17c843336c5dc0435645b44c0ef4 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3773321 Reviewed-by: Jack Rosenthal --- zephyr/zmake/zmake/zmake.py | 3 +++ 1 file changed, 3 insertions(+) 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, }, -- cgit v1.2.1