Revert "rebase"

This reverts commit 79810370f8fef31cfd80bf2fc374161072f78872.

mozilla-central/patches/9999999-with-vs2019.patch

@@ -7,7 +7,7 @@ Bug 9999999 - permit --with-visual-studio-version=2019.
 diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
 --- a/build/moz.configure/toolchain.configure
 +++ b/build/moz.configure/toolchain.configure
-@@ -527,26 +527,26 @@ def get_vc_paths(topsrcdir):
+@@ -523,27 +523,26 @@ def get_vc_paths(topsrcdir):
          )
          tools_path = os.path.join(path, r"VC\Tools\MSVC", tools_version)
          yield (Version(install["installationVersion"]), tools_path)
@@ -23,17 +23,17 @@ diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolc
  )
  
  
- @depends_if("--with-visual-studio-version", when=host_is_windows)
- def vs_version(value):
--    return value[0]
+ @depends("--with-visual-studio-version", when=host_is_windows)
+ def vs_major_version(value):
+     if value:
+-        return {"2017": 15}[value[0]]
 -
-+    if value:
 +        return {"2017": 15, "2019": 16}[value[0]]
  
- @depends(target, host)
- def is_windows(target, host):
-     return host.kernel == "WINNT" or target.kernel == "WINNT"
- 
+ option(
+     env="VC_PATH",
+     nargs=1,
+     when=host_is_windows,
+     help="Path to the Microsoft Visual C/C++ compiler",
+ )
  
- # Calling this a sysroot is a little weird, but it's the terminology clang went
- # with with its -winsysroot flag.