Skip to content

Commit abd73d8

Browse files
richardlaurichardlau
authored
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 <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Marco Ippolito <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Christian Clauss <[email protected]>
1 parent 27f98c3 commit abd73d8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

‎tools/make-v8.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ if [ "$ARCH" = "s390x" ] || [ "$ARCH" = "ppc64le" ]; then
5353
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"
5454
ninja -v -C "out.gn/$BUILD_ARCH_TYPE" "${JOBS_ARG}" d8 cctest inspector-test
5555
else
56-
DEPOT_TOOLS_DIR="$(cd _depot_tools && pwd)"
56+
DEPOT_TOOLS_DIR="$(cd depot_tools && pwd)"
5757
# shellcheck disable=SC2086
5858
PATH="$DEPOT_TOOLS_DIR":$PATH tools/dev/v8gen.py "$BUILD_ARCH_TYPE" $V8_BUILD_OPTIONS
5959
PATH="$DEPOT_TOOLS_DIR":$PATH ninja -C "out.gn/$BUILD_ARCH_TYPE/" "${JOBS_ARG}" d8 cctest inspector-test

‎tools/v8/node_common.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
def EnsureDepotTools(v8_path, fetch_if_not_exist):
2020
def _Get(v8_path):
21-
depot_tools = os.path.join(v8_path, "_depot_tools")
21+
depot_tools = os.path.join(v8_path, "depot_tools")
2222
try:
2323
gclient_path = os.path.join(depot_tools, "gclient.py")
2424
if os.path.isfile(gclient_path):

0 commit comments

Comments
 (0)