text: diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
  index a526d47e7786..946df3cd513c 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/cc_wrapper.gni")
   import("//build/toolchain/clang_static_analyzer.gni")
   import("//build/toolchain/goma.gni")
   import("//build/toolchain/toolchain.gni")
  @@ -28,8 +29,14 @@ if (use_goma) {
     } else {
       goma_prefix = "$goma_dir/gomacc "
     }
  +  clang_prefix = goma_prefix
   } else {
     goma_prefix = ""
  +  if (cc_wrapper != "") {
  +    clang_prefix = cc_wrapper + " "
  +  } else {
  +    clang_prefix = ""
  +  }
   }
   
   if (disable_goma) {
  @@ -389,7 +396,7 @@ if (target_os == "win" &&
     msvc_toolchain("win_clang_" + target_cpu) {
       environment = "environment." + target_cpu
       prefix = rebase_path("$clang_base_path/bin", root_build_dir)
  -    cl = "${goma_prefix}$prefix/${clang_cl}"
  +    cl = "${clang_prefix}$prefix/${clang_cl}"
       sys_include_flags = "${target_cpu_toolchain_data.include_flags_imsvc}"
   
       toolchain_args = {
  @@ -431,7 +438,7 @@ template("win_x64_toolchains") {
     msvc_toolchain("win_clang_" + target_name) {
       environment = "environment.x64"
       prefix = rebase_path("$clang_base_path/bin", root_build_dir)
  -    cl = "${goma_prefix}$prefix/${clang_cl}"
  +    cl = "${clang_prefix}$prefix/${clang_cl}"
       sys_include_flags = "${x64_toolchain_data.include_flags_imsvc}"
   
       toolchain_args = {
  