Roll buildtools 33a32b8aa2..f8fc76ea5c

build/toolchain/win/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 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/goma.gni")
 import("//build/toolchain/toolchain.gni")
@@ skipping 338 matching lines @@
                                    visual_studio_path,
                                    gyp_win_tool_path,
                                    windows_sdk_path,
                                    visual_studio_runtime_dirs,
                                    "x64",
                                    "${sys_include_prefix}",
                                  ],
                                  "scope")
 
 template("win_x64_toolchains") {
-  # TODO(mcgrathr): These assignments are only required because of
-  # crbug.com/395883.  Drop them if that ever gets fixed in GN.
-  goma_prefix = invoker.goma_prefix
-  x64_toolchain_data = invoker.x64_toolchain_data
-  clang_cl = invoker.clang_cl
-
   msvc_toolchain(target_name) {
     environment = "environment.x64"
     cl = "${goma_prefix}\"${x64_toolchain_data.vc_bin_dir}/cl.exe\""
 
     toolchain_args = {
       if (defined(invoker.toolchain_args)) {
         forward_variables_from(invoker.toolchain_args, "*")
       }
       is_clang = false
       current_cpu = "x64"
@@ skipping 10 matching lines @@
       if (defined(invoker.toolchain_args)) {
         forward_variables_from(invoker.toolchain_args, "*")
       }
       is_clang = true
       current_cpu = "x64"
     }
   }
 }
 
 win_x64_toolchains("x64") {
-  # TODO(mcgrathr): These assignments are only required because of
-  # crbug.com/395883.  Drop them if that ever gets fixed in GN.
-  goma_prefix = goma_prefix
-  x64_toolchain_data = x64_toolchain_data
+  toolchain_args = {
+    # Use the defaults.
+  }
 }
 
 # The nacl_win64 toolchain is nearly identical to the plain x64 toolchain.
 # It's used solely for building nacl64.exe (//components/nacl/broker:nacl64).
 # The only reason it's a separate toolchain is so that it can force
 # is_component_build to false in the toolchain_args() block, because
 # building nacl64.exe in component style does not work.
 win_x64_toolchains("nacl_win64") {
-  # TODO(mcgrathr): These assignments are only required because of
-  # crbug.com/395883.  Drop them if that ever gets fixed in GN.
-  goma_prefix = goma_prefix
-  x64_toolchain_data = x64_toolchain_data
-  clang_cl = clang_cl
-
   toolchain_args = {
     is_component_build = false
   }
 }
 
 # WinRT toolchains. Only define these when targeting them.
 #
 # NOTE: This is currently broken because it references vc_bin_dir. brettw@
 # changed this around a bit, and I don't know what this should be set to
 # in terms of what setup_toolchain returns for a certain CPU architecture.
@@ skipping 12 matching lines @@
   msvc_toolchain("winrt_x64") {
     environment = "environment.winrt_x64"
     cl = "${goma_prefix}\"${vc_bin_dir}/cl.exe\""
 
     toolchain_args = {
       is_clang = false
       current_cpu = "x64"
     }
   }
 }