nodejs
diff --git a/Collapse file
‎tools/make-v8.sh‎
Copy file name to clipboardExpand all lines: tools/make-v8.sh
+8-2Lines changed: 8 additions & 2 deletions b/Collapse file
‎tools/make-v8.sh‎
Copy file name to clipboardExpand all lines: tools/make-v8.sh
+8-2Lines changed: 8 additions & 2 deletions
@@ -29,10 +29,16 @@ if [ "$ARCH" = "s390x" ] || [ "$ARCH" = "ppc64le" ]; then
 
   # shellcheck disable=SC2154
   case "$CXX" in
-    *clang*) GN_COMPILER_OPTS="is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false treat_warnings_as_errors=false use_custom_libcxx=false" ;;
+    *clang*)
+      CLANG_VERSION=$(clang -dumpversion | cut -d. -f1)
+      RUST_VERSION=$(rustc --version --verbose | awk '/release:/ {print $2}')
+      GN_COMPILER_OPTS="is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false treat_warnings_as_errors=false use_custom_libcxx=false clang_version=\"${CLANG_VERSION}\""
+      GN_RUST_ARGS="rustc_version=\"${RUST_VERSION}\" rust_sysroot_absolute=\"/usr\" rust_bindgen_root=\"/usr\""
+      export RUSTC_BOOTSTRAP=1
+      ;;
     *) GN_COMPILER_OPTS="treat_warnings_as_errors=false use_custom_libcxx=false" ;;
   esac
-  gn gen -v "out.gn/$BUILD_ARCH_TYPE" --args="$GN_COMPILER_OPTS is_component_build=false is_debug=false v8_target_cpu=\"$TARGET_ARCH\" target_cpu=\"$TARGET_ARCH\" v8_enable_backtrace=true $CC_WRAPPER"
+  gn gen -v "out.gn/$BUILD_ARCH_TYPE" --args="$GN_COMPILER_OPTS is_component_build=false is_debug=false v8_target_cpu=\"$TARGET_ARCH\" target_cpu=\"$TARGET_ARCH\" v8_enable_backtrace=true ${GN_RUST_ARGS} $CC_WRAPPER"
   ninja -v -C "out.gn/$BUILD_ARCH_TYPE" "${JOBS_ARG}" d8 cctest inspector-test
 else
   DEPOT_TOOLS_DIR="$(cd depot_tools && pwd)"