Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1546491 - raise minimum windows SDK version; r=RyanVM

Browse Source 
We've landed some recent changes that implicitly require SDK
10.0.17134.0.  Since we've been building with that version for some time
in automation, let's go ahead and raise the minimum version accordingly.

Differential Revision: https://phabricator.services.mozilla.com/D28671

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Nathan Froyd 2019-04-24 16:15:10 +00:00
parent eb4f91eaa0
commit e6da99d7d3
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build/moz.configure/windows.configure
View File

@ -163,12 +163,12 @@ def valid_ucrt_sdk_dir_result(value):
return '%s in %s' % (value.version, quote(value.path))
@depends(windows_sdk_dir, 'WINDOWSSDKDIR', c_compiler)
@depends(windows_sdk_dir, 'WINDOWSSDKDIR')
@checking('for Universal CRT SDK', valid_ucrt_sdk_dir_result)
@imports('os')
@imports(_from='__builtin__', _import='sorted')
@imports(_import='mozpack.path', _as='mozpath')
def valid_ucrt_sdk_dir(windows_sdk_dir, windows_sdk_dir_env, c_compiler):
def valid_ucrt_sdk_dir(windows_sdk_dir, windows_sdk_dir_env):
if windows_sdk_dir_env:
windows_sdk_dir_env = windows_sdk_dir_env[0]
sdks = {}
@ -220,7 +220,7 @@ def valid_ucrt_sdk_dir(windows_sdk_dir, windows_sdk_dir_env, c_compiler):
'Please install it.')
version, sdk = sdks[valid_sdks[0]]
minimum_ucrt_version = Version('10.0.15063.0')
minimum_ucrt_version = Version('10.0.17134.0')
if version < minimum_ucrt_version:
raise FatalCheckError('Latest Universal CRT SDK version found %s'
' and minimum required is %s. This or a later'
@ -228,18 +228,6 @@ def valid_ucrt_sdk_dir(windows_sdk_dir, windows_sdk_dir_env, c_compiler):
' Studio installer.'
% (version, minimum_ucrt_version))
broken_ucrt_version = Version('10.0.16299.0')
working_ucrt_version = Version('10.0.17134.0')
if (c_compiler.type == 'clang-cl' and version >= broken_ucrt_version and
version < working_ucrt_version):
raise FatalCheckError('Found SDK version %s but clang-cl builds'
' currently don\'t work with the SDK version.'
' You should use a different version, either'
' by uninstalling version %s or setting a'
' custom WINDOWSSDKDIR.\n'
'Note: Version %s now works with clang-cl.'
% (version, version, working_ucrt_version))
return namespace(
path=sdk.path,
include=sdk.include,