Skip to content

Commit 3027815

Browse files
mspangpull[bot]
authored andcommitted
Move the bootstrap output dir inside the environment (#7212)
Putting it at out/ causes problems: 1) Our scripts and docs use subdirectories of out/ as the build root to allow creating multiple output directories with different configurations. These directories are now nested inside the bootstrap dir which is likely to cause confusion. 2) Using a single location in and out of docker breaks. The vscode docker moves the environment to work around these conflicts. Using a common build directory will cause similar breakage. 3) Cleaning the environment without cleaning out/ results in errors. This indicates they should be co-located.
1 parent 8ab7fea commit 3027815

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

scripts/bootstrap.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ EOF
7373
[ ! -s "$_SETUP_SH" ]; then
7474
pw_bootstrap --shell-file "$_SETUP_SH" \
7575
--install-dir "$_PW_ACTUAL_ENVIRONMENT_ROOT" \
76-
--config-file "$_CHIP_ROOT/$_CONFIG_FILE"
76+
--config-file "$_CHIP_ROOT/$_CONFIG_FILE" \
77+
--virtualenv-gn-out-dir "$_PW_ACTUAL_ENVIRONMENT_ROOT/gn_out"
7778
pw_finalize bootstrap "$_SETUP_SH"
7879
else
7980
pw_activate

0 commit comments

Comments
 (0)