commit 5f9dd5cc38a4ae9596296e86ca66f865e6d4f366
author pcloudy <pcloudy@google.com> Fri Dec 13 14:40:35 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Fri Dec 13 14:41:40 2019 -0800
tree b5022d8027d7ba43a2ec40b244462bf984ba60d7
parent efafe46b565825aa28fff15a0a115867e5084fd5

Fix Windows Clang support documentation

We didn't flip --incompatible_enable_cc_toolchain_resolution in 1.0, so the documentation is incorrect.

RELNOTES:None
PiperOrigin-RevId: 285474564

site/docs/windows.md

diff --git a/site/docs/windows.md b/site/docs/windows.md
index 23efa19..5107510 100644
--- a/site/docs/windows.md
+++ b/site/docs/windows.md
@@ -233,10 +233,11 @@
 
 * In bazel 0.28 and older: Clang is not supported.
 
-* In Bazel 0.29.0: You can enable the Clang toolchain by a build flag `--compiler=clang-cl`.
-  This is deprecated and will be removed in Bazel 1.0.
+* Without `--incompatible_enable_cc_toolchain_resolution`:
+  You can enable the Clang toolchain by a build flag `--compiler=clang-cl`.
 
-* From Bazel 1.0: You have to add a platform target to your build file (eg. the top level BUILD file):
+* With `--incompatible_enable_cc_toolchain_resolution`:
+  You have to add a platform target to your BUILD file (eg. the top level BUILD file):
     ```
     platform(
         name = "x64_windows-clang-cl",
@@ -266,7 +267,9 @@
     )
     ```
 
-    The reason we have those two ways is because [\-\-incompatible_enable_cc_toolchain_resolution](https://github.com/bazelbuild/bazel/issues/7260) flag.
+    The [\-\-incompatible_enable_cc_toolchain_resolution](https://github.com/bazelbuild/bazel/issues/7260)
+    flag is planned to be enabled by default in future Bazel release. Therefore,
+    it is recommended to enable Clang support with the second approach.
 
 ### Build Java