Use target cpu.
diff --git a/build/archives/BUILD.gn b/build/archives/BUILD.gn
index d2f055e..4395228 100644
--- a/build/archives/BUILD.gn
+++ b/build/archives/BUILD.gn
@@ -278,7 +278,7 @@
 if (is_win) {
   zip_bundle("archive_win_gen_snapshot") {
     deps = [ "//third_party/dart/runtime/bin:gen_snapshot" ]
-    output = "$target_platform_name-$android_cpu-$flutter_runtime_mode/windows-x64.zip"
+    output = "$target_platform_name-$target_cpu-$flutter_runtime_mode/windows-x64.zip"
     files = [
       {
         source = "$root_out_dir/gen_snapshot.exe"
diff --git a/tools/gn b/tools/gn
index 7b218ff..2a5ae57 100755
--- a/tools/gn
+++ b/tools/gn
@@ -288,12 +288,6 @@
     gn_args['target_cpu'] = get_target_cpu(args)
     gn_args['dart_target_arch'] = gn_args['target_cpu']
 
-  # No cross-compilation on Windows (for now). Use host toolchain that
-  # matches the bit-width of the target architecture.
-  if sys.platform.startswith(('cygwin', 'win')) and args.target_os != 'win':
-    gn_args['host_cpu'] = cpu_for_target_arch(gn_args['target_cpu'])
-    gn_args['target_cpu'] = cpu_for_target_arch(gn_args['target_cpu'])
-
   # macOS host builds (whether x64 or arm64) must currently be built under
   # Rosetta on Apple Silicon Macs.
   # TODO(cbracken): https://github.com/flutter/flutter/issues/103386