Update the visual studio version checking logic #12586
Conversation
|
I am not sure if this is the best way to distinguish between the different VS versions based on VC directory. Other solutions that I considered:
But I thought it is better to check that the VC subdirectories match the valid layout in VS 2017/2019. |
| @@ -254,14 +254,17 @@ 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(vc_path): | |||
| """Check if the installed VS version is Visual Studio 2017.""" | |||
| def _is_vs_2017_or_2019(repository_ctx, vc_path): | |||
There was a problem hiding this comment.
Thanks!
This check looks much better, according to https://devblogs.microsoft.com/cppblog/compiler-tools-layout-in-visual-studio-15/#where-the-compiler-toolset-moved-to-in-vs-2017, those three directory should always exist for 2017 and later version of Visual C++ Build Tools.
However, since file path is case-insensitive, can you convert all strings to lower case and then do the comparison? Just in case somehow the directory was created with different cases somehow.
This PR updates the
_is_vs_2017_or_2019function to specify the visual studio version based on the contents of the VC folder instead of depending on the parent directories of VC.This is helpful in cases where
BAZEL_VCpoints to a custom location of VC.Fixes: #11259