|
|
@@ -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,17 +527,17 @@ 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)
|
|
|
@@ -17,12 +17,23 @@ diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolc
|
|
|
"--with-visual-studio-version",
|
|
|
nargs=1,
|
|
|
- choices=("2017",),
|
|
|
-+ choices=("2017", "2019".),
|
|
|
++ choices=("2017", "2019",),
|
|
|
when=host_is_windows,
|
|
|
help="Select a specific Visual Studio version to use",
|
|
|
)
|
|
|
|
|
|
|
|
|
- @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]]
|
|
|
+-
|
|
|
++ return {"2017": 15, "2019": 16}[value[0]]
|
|
|
+
|
|
|
+ option(
|
|
|
+ env="VC_PATH",
|
|
|
+ nargs=1,
|
|
|
+ when=host_is_windows,
|
|
|
+ help="Path to the Microsoft Visual C/C++ compiler",
|
|
|
+ )
|
|
|
+
|
Bill Gianopoulos