From 2f4ed3b3f788f37a569410ce81777be949986ddd Mon Sep 17 00:00:00 2001 From: Paolo Tranquilli Date: Wed, 7 Jun 2023 17:56:13 +0200 Subject: [PATCH] Update windows VS detection code to account for new directory Windows VS 2022 version 17.6 introduced a new `vspkg` directory underneath `VC` that is throwing off the toolchain autodetection code. The checks now got renamed to a more approriate `_is_vs_2017_or_newer` and takes into account the possible presence of this `vspkg` directory. --- tools/cpp/windows_cc_configure.bzl | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/tools/cpp/windows_cc_configure.bzl b/tools/cpp/windows_cc_configure.bzl index bd30dc62d911ce..593a69a86a0d9a 100644 --- a/tools/cpp/windows_cc_configure.bzl +++ b/tools/cpp/windows_cc_configure.bzl @@ -254,17 +254,21 @@ def find_vc_path(repository_ctx): auto_configure_warning_maybe(repository_ctx, "Visual C++ build tools found at %s" % vc_dir) return vc_dir -def _is_vs_2017_or_2019(repository_ctx, vc_path): - """Check if the installed VS version is Visual Studio 2017 or 2019.""" +def _is_vs_2017_or_newer(repository_ctx, vc_path): + """Check if the installed VS version is Visual Studio 2017 or newer.""" - # The layout of VC folder in VS 2017 and 2019 is different from that in VS 2015 and older versions. - # In VS 2017 and 2019, it contains only three directories: + # The layout of VC folder in VS 2017 and newer versions is different from that in VS 2015 and older versions. + # From VS 2017 it contains only three directories: # "Auxiliary", "Redist", "Tools" + # From VS 2022 17.6, a fourth "vspkg" directory is also present - vc_2017_or_2019_contents = ["auxiliary", "redist", "tools"] + vc_2017_or_newer_contents = ["auxiliary", "redist", "tools"] vc_path_contents = [d.basename.lower() for d in repository_ctx.path(vc_path).readdir()] vc_path_contents = sorted(vc_path_contents) - return vc_path_contents == vc_2017_or_2019_contents + if vc_path_contents == vc_2017_or_newer_contents: + return True + vc_2017_or_newer_contents.append("vspkg") + return vc_path_contents == vc_2017_or_newer_contents def _is_msbuildtools(vc_path): """Check if the installed VC version is from MSBuildTools.""" @@ -275,7 +279,7 @@ def _is_msbuildtools(vc_path): def _find_vcvars_bat_script(repository_ctx, vc_path): """Find batch script to set up environment variables for VC. Doesn't %-escape the result.""" - if _is_vs_2017_or_2019(repository_ctx, vc_path): + if _is_vs_2017_or_newer(repository_ctx, vc_path): vcvars_script = vc_path + "\\Auxiliary\\Build\\VCVARSALL.BAT" else: vcvars_script = vc_path + "\\VCVARSALL.BAT" @@ -293,7 +297,7 @@ def _is_support_vcvars_ver(vc_full_version): def _is_support_winsdk_selection(repository_ctx, vc_path): """Windows SDK selection is supported with VC 2017 / 2019 or with full VS 2015 installation.""" - if _is_vs_2017_or_2019(repository_ctx, vc_path): + if _is_vs_2017_or_newer(repository_ctx, vc_path): return True # By checking the source code of VCVARSALL.BAT in VC 2015, we know that @@ -319,7 +323,7 @@ def _get_vc_env_vars(repository_ctx, vc_path, msvc_vars_x64, target_arch): dictionary of envvars """ env = {} - if _is_vs_2017_or_2019(repository_ctx, vc_path): + if _is_vs_2017_or_newer(repository_ctx, vc_path): lib = msvc_vars_x64["%{msvc_env_lib_x64}"] full_version = _get_vc_full_version(repository_ctx, vc_path) tools_path = "%s\\Tools\\MSVC\\%s\\bin\\HostX64\\%s" % (vc_path, full_version, target_arch) @@ -367,7 +371,7 @@ def setup_vc_env_vars(repository_ctx, vc_path, envvars = [], allow_empty = False # Get VC version set by user. Only supports VC 2017 & 2019. vcvars_ver = "" - if _is_vs_2017_or_2019(repository_ctx, vc_path): + if _is_vs_2017_or_newer(repository_ctx, vc_path): full_version = _get_vc_full_version(repository_ctx, vc_path) # Because VCVARSALL.BAT is from the latest VC installed, so we check if the latest @@ -448,7 +452,7 @@ def _find_msvc_tools(repository_ctx, vc_path, target_arch = "x64"): def find_msvc_tool(repository_ctx, vc_path, tool, target_arch = "x64"): """Find the exact path of a specific build tool in MSVC. Doesn't %-escape the result.""" tool_path = None - if _is_vs_2017_or_2019(repository_ctx, vc_path) or _is_msbuildtools(vc_path): + if _is_vs_2017_or_newer(repository_ctx, vc_path) or _is_msbuildtools(vc_path): full_version = _get_vc_full_version(repository_ctx, vc_path) if full_version: tool_path = "%s\\Tools\\MSVC\\%s\\bin\\HostX64\\%s\\%s" % (vc_path, full_version, target_arch, tool)