diff --git a/build_tools/scripts/core_common/modules/v8_89.py b/build_tools/scripts/core_common/modules/v8_89.py index 2c920a4..42d21db 100644 --- a/build_tools/scripts/core_common/modules/v8_89.py +++ b/build_tools/scripts/core_common/modules/v8_89.py @@ -43,7 +43,11 @@ def make_args(args, platform, is_64=True, is_debug=False): args_copy = args[:] args_copy.append("target_cpu=\\\"arm64\\\"") args_copy.append("v8_target_cpu=\\\"arm64\\\"") - args_copy.append("use_sysroot=true") + args_copy.append("is_clang=true") + args_copy.append("use_custom_libcxx=false") + args_copy.append("clang_base_path=\\\"/usr/lib/llvm-14\\\"") + args_copy.append("clang_use_chrome_plugins=false") + args_copy.append("use_sysroot=false") if is_debug: args_copy.append("is_debug=true") @@ -55,6 +59,8 @@ def make_args(args, platform, is_64=True, is_debug=False): linux_clang = False if (platform == "linux"): args_copy.append("is_clang=true") + args_copy.append("clang_base_path=\\\"/usr/lib/llvm-14\\\"") + args_copy.append("clang_use_chrome_plugins=false") if "1" == config.option("use-clang"): args_copy.append("use_sysroot=true") linux_clang = True @@ -127,7 +133,7 @@ def make(): base.cmd("git", ["clone", "https://chromium.googlesource.com/chromium/tools/depot_tools.git"]) change_bootstrap() - os.environ["PATH"] = base_dir + "/depot_tools" + os.pathsep + os.environ["PATH"] + os.environ["PATH"] = os.environ["PATH"] + os.pathsep + base_dir + "/depot_tools" if ("windows" == base.host_platform()): base.set_env("DEPOT_TOOLS_WIN_TOOLCHAIN", "0") @@ -180,8 +186,7 @@ def make(): base.cmd("ninja", ["-C", "out.gn/linux_32"]) if config.check_option("platform", "linux_arm64"): - base.cmd("build/linux/sysroot_scripts/install-sysroot.py", ["--arch=arm64"], False) - base.cmd2("gn", ["gen", "out.gn/linux_arm64", make_args(gn_args, "linux_arm64", False)]) + base.cmd2("gn", ["gen", "out.gn/linux_arm64", make_args(gn_args, "linux_arm64")]) base.cmd("ninja", ["-C", "out.gn/linux_arm64"]) if config.check_option("platform", "mac_64"):