File tree Expand file tree Collapse file tree 1 file changed +8
-2
lines changed
Expand file tree Collapse file tree 1 file changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -29,10 +29,16 @@ if [ "$ARCH" = "s390x" ] || [ "$ARCH" = "ppc64le" ]; then
2929
3030 # shellcheck disable=SC2154
3131 case " $CXX " in
32- * 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" ;;
32+ * clang* )
33+ CLANG_VERSION=$( clang -dumpversion | cut -d. -f1)
34+ RUST_VERSION=$( rustc --version --verbose | awk ' /release:/ {print $2}' )
35+ 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} \" "
36+ GN_RUST_ARGS=" rustc_version=\" ${RUST_VERSION} \" rust_sysroot_absolute=\" /usr\" rust_bindgen_root=\" /usr\" "
37+ export RUSTC_BOOTSTRAP=1
38+ ;;
3339 * ) GN_COMPILER_OPTS=" treat_warnings_as_errors=false use_custom_libcxx=false" ;;
3440 esac
35- 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 "
41+ 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"
3642 ninja -v -C " out.gn/$BUILD_ARCH_TYPE " " ${JOBS_ARG} " d8 cctest inspector-test
3743else
3844 DEPOT_TOOLS_DIR=" $( cd depot_tools && pwd) "
You can’t perform that action at this time.
0 commit comments