Commit 2fbd3bb
build: fix compatibility with V8's depot_tools
Recent changes to `depot_tools`'s `ninja.py` proxy is causing infinite
recursion in our V8 CI builds as we checkout `depot_tools` into a
directory with a leading `_` (i.e. `_depot_tools`) and the proxy now
checks for an exact match (i.e. `== "depot_tools"`) instead of
`endswith("depot_tools")`.
Rename our checkout to `depot_tools` (without the leading `_`) so the
`ninja.py` proxy can exclude it when reinvoking `ninja`.
PR-URL: #57330
Fixes: nodejs/build#4027
Refs: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6259139
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Christian Clauss <cclauss@me.com>1 parent 8e64d38 commit 2fbd3bb
2 files changed
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -53,7 +53,7 @@ if [ "$ARCH" = "s390x" ] || [ "$ARCH" = "ppc64le" ]; then | |||
| 53 | 53 | gn gen -v "out.gn/$BUILD_ARCH_TYPE" --args="is_component_build=false is_debug=false use_goma=false goma_dir=\"None\" use_custom_libcxx=false v8_target_cpu=\"$TARGET_ARCH\" target_cpu=\"$TARGET_ARCH\" v8_enable_backtrace=true $CC_WRAPPER" | |
| 54 | 54 | ninja -v -C "out.gn/$BUILD_ARCH_TYPE" "${JOBS_ARG}" d8 cctest inspector-test | |
| 55 | 55 | else | |
| 56 | - DEPOT_TOOLS_DIR="$(cd _depot_tools && pwd)" | ||
| 56 | + DEPOT_TOOLS_DIR="$(cd depot_tools && pwd)" | ||
| 57 | 57 | # shellcheck disable=SC2086 | |
| 58 | 58 | PATH="$DEPOT_TOOLS_DIR":$PATH tools/dev/v8gen.py "$BUILD_ARCH_TYPE" $V8_BUILD_OPTIONS | |
| 59 | 59 | PATH="$DEPOT_TOOLS_DIR":$PATH ninja -C "out.gn/$BUILD_ARCH_TYPE/" "${JOBS_ARG}" d8 cctest inspector-test | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | 19 | def EnsureDepotTools(v8_path, fetch_if_not_exist): | |
| 20 | 20 | def _Get(v8_path): | |
| 21 | - depot_tools = os.path.join(v8_path, "_depot_tools") | ||
| 21 | + depot_tools = os.path.join(v8_path, "depot_tools") | ||
| 22 | 22 | try: | |
| 23 | 23 | gclient_path = os.path.join(depot_tools, "gclient.py") | |
| 24 | 24 | if os.path.isfile(gclient_path): | |
0 commit comments