From ea3c4ea98097618c64b04375d73c0e01bd7bcb94 Mon Sep 17 00:00:00 2001
From: patricearruda84 <patrice.arruda@mongodb.com>
Date: Thu, 1 May 2025 12:16:22 -0400
Subject: [PATCH] SERVER-104169: Enable the custom windows cc toolchain.
 (#35619)

GitOrigin-RevId: 3bfb0024553ebd4befea39693009193d155f443f
---
 bazel/platforms/local_config_platform.bzl                | 9 ++++-----
 .../cc/mongo_windows/mongo_toolchain.BUILD.tmpl          | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bazel/platforms/local_config_platform.bzl b/bazel/platforms/local_config_platform.bzl
index cdf34b35f32..35147f0fe1f 100644
--- a/bazel/platforms/local_config_platform.bzl
+++ b/bazel/platforms/local_config_platform.bzl
@@ -70,11 +70,10 @@ def _setup_local_config_platform(ctx):
         constraints_str += ',\n        "@//bazel/platforms:%s"' % (distro)
         result = {"DISTRO": distro}
         exec_props = ""
-        #elif os == "windows":
-        #constraints_str += ',\n        "@//bazel/platforms:use_mongo_windows_toolchain_config"'
-        #result = {"USE_NATIVE_TOOLCHAIN": "1"}
-        #exec_props = ""
-
+    elif os == "windows":
+        constraints_str += ',\n        "@//bazel/platforms:use_mongo_windows_toolchain_config"'
+        result = {"USE_NATIVE_TOOLCHAIN": "1"}
+        exec_props = ""
     else:
         result = {"USE_NATIVE_TOOLCHAIN": "1"}
         exec_props = ""
diff --git a/bazel/toolchains/cc/mongo_windows/mongo_toolchain.BUILD.tmpl b/bazel/toolchains/cc/mongo_windows/mongo_toolchain.BUILD.tmpl
index b95ba3255b2..25c593565d4 100644
--- a/bazel/toolchains/cc/mongo_windows/mongo_toolchain.BUILD.tmpl
+++ b/bazel/toolchains/cc/mongo_windows/mongo_toolchain.BUILD.tmpl
@@ -36,6 +36,7 @@ mongo_windows_cc_toolchain_config(
         "strip": "wrapper/bin/msvc_nop.bat",
     },
     toolchain_identifier = "msvc_x64",
+    supports_parse_showincludes = True,
 )
 
 cc_toolchain(