build: fix compatibility with V8's depot_tools

richardlau · marco-ippolito · commit d8eaf5b9b8b7 · 2025-03-07T18:56:40.000+01:00
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>
diff --git a/tools/make-v8.sh b/tools/make-v8.sh
@@ -53,7 +53,7 @@ if [ "$ARCH" = "s390x" ] || [ "$ARCH" = "ppc64le" ]; then
   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"
   ninja -v -C "out.gn/$BUILD_ARCH_TYPE" "${JOBS_ARG}" d8 cctest inspector-test
 else
-  DEPOT_TOOLS_DIR="$(cd _depot_tools && pwd)"
+  DEPOT_TOOLS_DIR="$(cd depot_tools && pwd)"
   # shellcheck disable=SC2086
   PATH="$DEPOT_TOOLS_DIR":$PATH tools/dev/v8gen.py "$BUILD_ARCH_TYPE" $V8_BUILD_OPTIONS
   PATH="$DEPOT_TOOLS_DIR":$PATH ninja -C "out.gn/$BUILD_ARCH_TYPE/" "${JOBS_ARG}" d8 cctest inspector-test
diff --git a/tools/v8/node_common.py b/tools/v8/node_common.py
@@ -18,7 +18,7 @@
 
 def EnsureDepotTools(v8_path, fetch_if_not_exist):
   def _Get(v8_path):
-    depot_tools = os.path.join(v8_path, "_depot_tools")
+    depot_tools = os.path.join(v8_path, "depot_tools")
     try:
       gclient_path = os.path.join(depot_tools, "gclient.py")
       if os.path.isfile(gclient_path):
