aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2024-12-09 08:43:31 +0300
committerthegeorg <thegeorg@yandex-team.com>2024-12-09 09:00:41 +0300
commit2e9f0e3f55ab1c9718a9dd08a474360af289eb9b (patch)
treea0adb70938475d3d59b4a7349e6ff391e810c941
parent5ac963e5a3f77560068761d77dead7c806424d72 (diff)
downloadydb-2e9f0e3f55ab1c9718a9dd08a474360af289eb9b.tar.gz
Remove support for old Windows SDK versions
commit_hash:ff7e579382854cf7f0fedced54e75557b2597196
-rwxr-xr-xbuild/ymake_conf.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/build/ymake_conf.py b/build/ymake_conf.py
index 26023718b3..0e8548d2ad 100755
--- a/build/ymake_conf.py
+++ b/build/ymake_conf.py
@@ -1839,12 +1839,7 @@ class MSVCToolchainOptions(ToolchainOptions):
# TODO(somov): Определять автоматически self.version в этом случае
else:
- if self.version_at_least(2019):
- self.sdk_version = '10.0.18362.0'
- if is_positive('MSVC20'): # XXX: temporary flag, remove after DTCC-123 is completed
- self.cxx_std = 'c++latest'
- else:
- self.sdk_version = '10.0.16299.0'
+ self.sdk_version = '10.0.18362.0'
sdk_dir = '$WINDOWS_KITS_RESOURCE_GLOBAL'
self.vc_root = self.name_marker if not self.use_clang else '$MSVC_FOR_CLANG_RESOURCE_GLOBAL'
@@ -1916,9 +1911,6 @@ class MSVCToolchain(MSVC, Toolchain):
emit('TOOLCHAIN_ENV', format_env(self.tc.get_env(), list_separator=';'))
- if self.tc.sdk_version:
- emit('WINDOWS_KITS_VERSION', self.tc.sdk_version)
-
if self.tc.under_wine_tools:
emit('_UNDER_WINE_TOOLS', 'yes')
if self.tc.under_wine_link: