◐ Shell
clean mode source ↗

build: fix compatibility with V8's `depot_tools` · nodejs/node@2fbd3bb

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

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):