Auto merge of #178 - servo:limit-msvc-sdk, r=asajeffrey

Allow more recent SDK versions

This cherry-picks https://hg.mozilla.org/mozilla-central/rev/c085e1b32fb9.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/mozjs/178)
<!-- Reviewable:end -->

Author: bors-servo

Cargo.toml

@@ -2,7 +2,7 @@
 name = "mozjs_sys"
 description = "System crate for the Mozilla SpiderMonkey JavaScript engine."
 repository = "https://github.com/servo/mozjs/"
-version = "0.61.11"
+version = "0.61.12"
 authors = ["Mozilla"]
 links = "mozjs"
 build = "build.rs"

etc/patches/broken-sdk.patch

@@ -0,0 +1,15 @@
+diff --git a/mozjs/build/moz.configure/windows.configure b/mozjs/build/moz.configure/windows.configure
+index 76f21465e4..08daf9c7d8 100644
+--- a/mozjs/build/moz.configure/windows.configure
++++ b/mozjs/build/moz.configure/windows.configure
+@@ -237,7 +237,9 @@ def valid_ucrt_sdk_dir(windows_sdk_dir, windows_sdk_dir_env, c_compiler):
+                               % (version, minimum_ucrt_version))
+ 
+     broken_ucrt_version = Version('10.0.16299.0')
+-    if c_compiler.type == 'clang-cl' and version >= broken_ucrt_version:
++    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 SDK version %s'
+                               ' and later. You should use an older SDK,'

mozjs/build/moz.configure/windows.configure

@@ -237,7 +237,9 @@ def valid_ucrt_sdk_dir(windows_sdk_dir, windows_sdk_dir_env, c_compiler):
                               % (version, minimum_ucrt_version))
 
     broken_ucrt_version = Version('10.0.16299.0')
-    if c_compiler.type == 'clang-cl' and version >= broken_ucrt_version:
+    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 SDK version %s'
                               ' and later. You should use an older SDK,'