| Index: build/toolchain/win/BUILD.gn
|
| diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
|
| index dd1017fb3d9f4f08d0b2f6fa34e1d307b228956f..7cc307ab629d4225f0bacd8b37066240ed0db183 100644
|
| --- a/build/toolchain/win/BUILD.gn
|
| +++ b/build/toolchain/win/BUILD.gn
|
| @@ -6,6 +6,7 @@ import("//build/config/clang/clang.gni")
|
| import("//build/config/compiler/compiler.gni")
|
| import("//build/config/sanitizers/sanitizers.gni")
|
| import("//build/config/win/visual_studio_version.gni")
|
| +import("//build/toolchain/clang_static_analyzer.gni")
|
| import("//build/toolchain/goma.gni")
|
| import("//build/toolchain/toolchain.gni")
|
|
|
| @@ -27,6 +28,13 @@ if (use_goma) {
|
| goma_prefix = ""
|
| }
|
|
|
| +# Path to the Clang static analysis wrapper script.
|
| +if (is_clang && use_clang_static_analyzer) {
|
| + analyzer_prefix = "$python_path " + rebase_path(
|
| + "//build/toolchain/clang_static_analyzer_wrapper.py",
|
| + root_build_dir) + " --clang-prefix=\"-Xclang\" "
|
| +}
|
| +
|
| # Copy the VS runtime DLL for the default toolchain to the root build directory
|
| # so things will run.
|
| if (current_toolchain == default_toolchain) {
|
| @@ -380,7 +388,7 @@ template("win_x64_toolchains") {
|
| msvc_toolchain("clang_" + target_name) {
|
| environment = "environment.x64"
|
| prefix = rebase_path("$clang_base_path/bin", root_build_dir)
|
| - cl = "${goma_prefix}$prefix/${clang_cl}"
|
| + cl = "${analyzer_prefix}${goma_prefix}$prefix/${clang_cl}"
|
| sys_include_flags = "${x64_toolchain_data.include_flags_imsvc}"
|
|
|
| toolchain_args = {
|
|
|