Skip to content

Commit 44ab436

Browse files
committed
8371967: Add Visual Studio 2026 to build toolchain for Windows
Backport-of: dcba014
1 parent 43f752f commit 44ab436

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

doc/building.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ <h3 id="microsoft-visual-studio">Microsoft Visual Studio</h3>
668668
(Note that this version is often presented as "MSVC 14.28", and reported
669669
by cl.exe as 19.28.) Older versions will not be accepted by
670670
<code>configure</code> and will not work. The maximum accepted version
671-
of Visual Studio is 2022.</p>
671+
of Visual Studio is 2026.</p>
672672
<p>If you have multiple versions of Visual Studio installed,
673673
<code>configure</code> will by default pick the latest. You can request
674674
a specific version to be used by setting

doc/building.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ available for this update.
468468
The minimum accepted version is Visual Studio 2019 version 16.8. (Note that
469469
this version is often presented as "MSVC 14.28", and reported by cl.exe as
470470
19.28.) Older versions will not be accepted by `configure` and will not work.
471-
The maximum accepted version of Visual Studio is 2022.
471+
The maximum accepted version of Visual Studio is 2026.
472472

473473
If you have multiple versions of Visual Studio installed, `configure` will by
474474
default pick the latest. You can request a specific version to be used by

make/autoconf/toolchain_microsoft.m4

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
################################################################################
2727
# The order of these defines the priority by which we try to find them.
28-
VALID_VS_VERSIONS="2022 2019"
28+
VALID_VS_VERSIONS="2022 2019 2026"
2929

3030
VS_DESCRIPTION_2019="Microsoft Visual Studio 2019"
3131
VS_VERSION_INTERNAL_2019=142
@@ -57,6 +57,21 @@ VS_SDK_PLATFORM_NAME_2022=
5757
VS_SUPPORTED_2022=true
5858
VS_TOOLSET_SUPPORTED_2022=true
5959

60+
VS_DESCRIPTION_2026="Microsoft Visual Studio 2026"
61+
VS_VERSION_INTERNAL_2026=145
62+
VS_MSVCR_2026=vcruntime140.dll
63+
VS_VCRUNTIME_1_2026=vcruntime140_1.dll
64+
VS_MSVCP_2026=msvcp140.dll
65+
VS_ENVVAR_2026="VS180COMNTOOLS"
66+
VS_USE_UCRT_2026="true"
67+
VS_VS_INSTALLDIR_2026="Microsoft Visual Studio/18"
68+
VS_EDITIONS_2026="BuildTools Community Professional Enterprise"
69+
VS_SDK_INSTALLDIR_2026=
70+
VS_VS_PLATFORM_NAME_2026="v145"
71+
VS_SDK_PLATFORM_NAME_2026=
72+
VS_SUPPORTED_2026=true
73+
VS_TOOLSET_SUPPORTED_2026=true
74+
6075
################################################################################
6176

6277
AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],

0 commit comments

Comments
 (0)