commit df42789d3e71a97a6ad0fbccb4ea9db4f05e2c7c
author pcloudy <pcloudy@google.com> Wed Jul 04 06:32:33 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed Jul 04 06:34:02 2018 -0700
tree 2c6ad7669a65416d20a4655d4ff1f08c1ac26191
parent c366166686d690beb9a5a9ee53ceef76a2434a76

windows_cc_configure.bzl: Check default VC installation directories

See https://github.com/bazelbuild/bazel/issues/5254#issuecomment-402131986

RELNOTES: None
PiperOrigin-RevId: 203273587

tools/cpp/windows_cc_configure.bzl

diff --git a/tools/cpp/windows_cc_configure.bzl b/tools/cpp/windows_cc_configure.bzl
index 11dc0ad..149eb39 100644
--- a/tools/cpp/windows_cc_configure.bzl
+++ b/tools/cpp/windows_cc_configure.bzl
@@ -168,6 +168,20 @@
                     if line.startswith(version) and line.find("REG_SZ") != -1:
                         vc_dir = line[line.find("REG_SZ") + len("REG_SZ"):].strip() + suffix
 
+    # 4. Check default directories for VC installation
+    auto_configure_warning("Looking for default Visual C++ installation directory")
+    program_files_dir = get_env_var(repository_ctx, "PROGRAMFILES(X86)", default = "C:\\Program Files (x86)", enable_warning = True)
+    for path in [
+        "Microsoft Visual Studio\\2017\\BuildTools\\VC",
+        "Microsoft Visual Studio\\2017\\Community\\VC",
+        "Microsoft Visual Studio\\2017\\Enterprise\\VC",
+        "Microsoft Visual Studio 14.0\\VC",
+    ]:
+        path = program_files_dir + "\\" + path
+        if repository_ctx.path(path).exists:
+            vc_dir = path
+            break
+
     if not vc_dir:
         return None
     auto_configure_warning("Visual C++ build tools found at %s" % vc_dir)