--- a/build/config/clang/BUILD.gn +++ b/build/config/clang/BUILD.gn @@ -105,6 +105,7 @@ _prefix = "lib" _suffix = "" _ext = "a" + _libprefix = "" if (is_win) { _dir = "windows" _prefix = "" @@ -122,13 +123,13 @@ _dir = "darwin" } else if (is_linux || is_chromeos) { if (current_cpu == "x64") { - _dir = "x86_64-unknown-linux-gnu" + _dir = "x86_64-rosa-linux-gnu" } else if (current_cpu == "x86") { _dir = "i386-unknown-linux-gnu" } else if (current_cpu == "arm") { _dir = "armv7-unknown-linux-gnueabihf" } else if (current_cpu == "arm64") { - _dir = "aarch64-unknown-linux-gnu" + _dir = "aarch64-rosa-linux-gnu" } else { assert(false) # Unhandled cpu type } @@ -159,7 +160,13 @@ assert(false) # Unhandled target platform } - _clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib" + if (is_linux || is_chromeos) { + if (clang_version == "17") { + _libprefix = "64" + } +} + + _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" ] }