--- chromium-141.0.7390.37/build/config/clang/BUILD.gn 2025/10/01 10:09:34 1.1 +++ chromium-141.0.7390.37/build/config/clang/BUILD.gn 2025/10/01 11:38:41 @@ -153,6 +153,7 @@ _suffix = "" _ext = "a" + _libprefix = "" if (is_win) { _dir = "windows" _prefix = "" @@ -168,7 +169,19 @@ } } else if (is_apple) { _dir = "darwin" - } else if (is_linux || is_chromeos) { + } else if (is_linux) { + _libprefix = "64" + _dir = "linux" + if (current_cpu == "x64") { + _suffix ="-x86_64" + } else if (current_cpu == "arm64") { + _suffix = "-aarch64" + } else if (current_cpu == "riscv64") { + _suffix = "-riscv64" + } else { + assert(false) # Unhandled cpu type + } + } else if (is_chromeos) { if (current_cpu == "x64") { _dir = "x86_64-unknown-linux-gnu" } else if (current_cpu == "x86") { @@ -215,7 +228,7 @@ assert(false) # Unhandled target platform } - _clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib" + _clang_lib_dir = "$clang_base_path/lib${_libprefix}/clang/$clang_version/lib" _lib_file = "${_prefix}clang_rt.${_libname}${_suffix}.${_ext}" libs = [ "$_clang_lib_dir/$_dir/$_lib_file" ] }