Make MSVC CROSSTOOL default on Windows

The default C++ CROSSTOOL on Windows now becomes MSVC,
--cpu=x64_windows_msvc is still supported

To use MSYS toolcahin, add --cpu=x64_windows_msys and
--host_cpu=x64_windows_msys for host compilation

See https://github.com/bazelbuild/bazel/issues/2627

--
Change-Id: Ie788a39cb5ffbc9fc956ccfd51a3cc816c74543a
Reviewed-on: https://cr.bazel.build/9292
PiperOrigin-RevId: 149530250
MOS_MIGRATED_REVID=149530250

1 files changed, 20 insertions, 0 deletions

diff --git a/src/main/tools/jdk.BUILD b/src/main/tools/jdk.BUILD
index 97ac6dbff7..3e273442a1 100644
--- a/src/main/tools/jdk.BUILD
+++ b/src/main/tools/jdk.BUILD
@@ -29,6 +29,8 @@ filegroup(
     name = "java",
     srcs = select({
        ":windows" : ["bin/java.exe"],
+       ":windows_msys" : ["bin/java.exe"],
+       ":windows_msvc" : ["bin/java.exe"],
        "//conditions:default" : ["bin/java"],
     }),
 )
@@ -37,6 +39,8 @@ filegroup(
     name = "jar",
     srcs = select({
        ":windows" : ["bin/jar.exe"],
+       ":windows_msys" : ["bin/jar.exe"],
+       ":windows_msvc" : ["bin/jar.exe"],
        "//conditions:default" : ["bin/jar"],
     }),
 )
@@ -45,6 +49,8 @@ filegroup(
     name = "javac",
     srcs = select({
         ":windows" : ["bin/javac.exe"],
+        ":windows_msys" : ["bin/javac.exe"],
+        ":windows_msvc" : ["bin/javac.exe"],
         "//conditions:default" : ["bin/javac"],
     }),
 )
@@ -91,6 +97,8 @@ filegroup(
         # common antivirus software blocks access to npjp2.dll interfering with Bazel,
         # so do not include it in JRE on Windows.
         ":windows" : glob(["jre/bin/**"], exclude = ["jre/bin/plugin2/**"]),
+        ":windows_msys" : glob(["jre/bin/**"], exclude = ["jre/bin/plugin2/**"]),
+        ":windows_msvc" : glob(["jre/bin/**"], exclude = ["jre/bin/plugin2/**"]),
         "//conditions:default" : glob(["jre/bin/**"])
     }),
 )
@@ -169,3 +177,15 @@ config_setting(
     values = {"cpu": "x64_windows"},
     visibility = ["//visibility:private"],
 )
+
+config_setting(
+    name = "windows_msys",
+    values = {"cpu": "x64_windows_msys"},
+    visibility = ["//visibility:private"],
+)
+
+config_setting(
+    name = "windows_msvc",
+    values = {"cpu": "x64_windows_msvc"},
+    visibility = ["//visibility:private"],
+)