Roll buildtools 33a32b8aa2..f8fc76ea5c

build/toolchain/win/BUILD.gn

Index: build/toolchain/win/BUILD.gn
diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
index f46b90fff134fb7b74232e8ffac93c5ee6a728c5..0549a6b698dc86a1a061076dc70158a8b4c4844d 100644
--- a/build/toolchain/win/BUILD.gn
+++ b/build/toolchain/win/BUILD.gn
@@ -356,12 +356,6 @@ x64_toolchain_data = exec_script("setup_toolchain.py",
                                  "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\""
@@ -392,10 +386,9 @@ template("win_x64_toolchains") {
 }
 
 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.
@@ -404,12 +397,6 @@ win_x64_toolchains("x64") {
 # 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
   }