Bug 1546491 - raise minimum windows SDK version; r=RyanVM
☠☠ backed out by ee5aaa63c2c4 ☠ ☠
authorNathan Froyd <froydnj@mozilla.com>
Wed, 24 Apr 2019 15:09:05 +0000
changeset 529484 445a4ea25bb10366aa07cdac105d108fc0103ef6
parent 529483 ea2444833ad7f12aec341f5781f19739a6834bf7
child 529485 46b5a3dff2bc3be9cca5046378c108e85567ee29
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRyanVM
bugs1546491, 17134
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1546491 - raise minimum windows SDK version; r=RyanVM 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
build/moz.configure/windows.configure
--- a/build/moz.configure/windows.configure
+++ b/build/moz.configure/windows.configure
@@ -215,36 +215,24 @@ def valid_ucrt_sdk_dir(windows_sdk_dir, 
                 'CRT.' % windows_sdk_dir_env)
 
     valid_sdks = sorted(sdks, key=lambda x: sdks[x][0], reverse=True)
     if not valid_sdks:
         raise FatalCheckError('Cannot find the Universal CRT SDK. '
                               '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'
                               ' version can be installed using the Visual'
                               ' 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,
         lib=sdk.lib,
         version=version,
     )