commit ef95c6fd96fd3478b0d6e745c2128a6d20301fa8
author Rob Mohr <mohrr@google.com> Wed Apr 28 08:11:58 2021 -0700
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Apr 28 18:10:58 2021 +0000
tree 249e1ae707455853ef90d5bc030d47a69f129abe
parent 99f33f5a67344aef8ded17528051f22c35232847

pw_env_setup: Don't clear out args.gn

pwrev/33125 causes args.gn to be cleared out when running bootstrap.
Update it to only set dir_pigweed when the build directory has not yet
been created.

Change-Id: Ib6f34005c1093771d126bda9bef48196b2f27a0d
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/42800
Reviewed-by: Paul Mathieu <paulmathieu@google.com>
Reviewed-by: Wyatt Hepler <hepler@google.com>
Commit-Queue: Rob Mohr <mohrr@google.com>

pw_env_setup/py/pw_env_setup/virtualenv_setup/install.py

diff --git a/pw_env_setup/py/pw_env_setup/virtualenv_setup/install.py b/pw_env_setup/py/pw_env_setup/virtualenv_setup/install.py
index d6036fe..555f462 100644
--- a/pw_env_setup/py/pw_env_setup/virtualenv_setup/install.py
+++ b/pw_env_setup/py/pw_env_setup/virtualenv_setup/install.py
@@ -203,12 +203,13 @@
         gn_log_path = os.path.join(venv_path, gn_log)
         try:
             with open(gn_log_path, 'w') as outs:
-                gn_cmd = (
-                    'gn',
-                    'gen',
-                    build_dir,
-                    '--args=dir_pigweed="{}"'.format(pw_root),
-                )
+                gn_cmd = ['gn', 'gen', build_dir]
+
+                # Only set dir_pigweed if we don't have an existing build
+                # directory.
+                if not os.path.isdir(build_dir):
+                    gn_cmd.append('--args=dir_pigweed="{}"'.format(pw_root))
+
                 print(gn_cmd, file=outs)
                 subprocess.check_call(gn_cmd,
                                       cwd=os.path.join(project_root,