diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2022-08-09 10:01:18 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-08-09 18:48:45 +0000 |
| commit | d7ee20ee4b8f528a9c1e6a8ea9b009e443363bce (patch) | |
| tree | c6f36b24bee92aa877480e9ed86c2eacb7fe1bfb /docs | |
| parent | 9739188617a8dbcc6ea3821de39192ab2e6aec7a (diff) | |
| download | chrome-ec-d7ee20ee4b8f528a9c1e6a8ea9b009e443363bce.tar.gz | |
Reland "zephyr: Make ZEPHYR_BASE not an environment variable""
This reverts commit ab36e4ff4322b9c3bcdb59ecaf19e055b1365545.
The original CL landed at CL:3811715, but was reverted, as we broke
the ebuild case, as we dropped environment variables from the ninja
call.
This reland is exactly the same, but re-adds the environment to the
ninja call:
Change-Id: Id57845a3dca0cc05f9cafa55db337885f88a327a
--- a/zephyr/zmake/zmake/zmake.py
+++ b/zephyr/zmake/zmake/zmake.py
@@ -782,6 +782,8 @@ class Zmake:
errors="replace",
+ # TODO(b/239619222): Filter os.environ for ninja.
+ env=os.environ,
)
BUG=b:239619222
BRANCH=none
TEST=zmake testall
emerge-brya-zephyr chromeos-zephyr
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I62aa1672c3aa463fa36166b980fe6879aac04c40
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3820643
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
Commit-Queue: Abe Levkoy <alevkoy@chromium.org>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/zephyr/project_config.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/zephyr/project_config.md b/docs/zephyr/project_config.md index f12d47ba36..6e1346b0fa 100644 --- a/docs/zephyr/project_config.md +++ b/docs/zephyr/project_config.md @@ -112,7 +112,7 @@ This file, should at minimum contain the following: ``` cmake cmake_minimum_required(VERSION 3.20.1) -find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) +find_package(Zephyr REQUIRED HINTS "${ZEPHYR_BASE}") project(ec) ``` |