|
@@ -7,7 +7,7 @@ Bug 9999999 - permit specifying 2019 and 2022 for --with-visual-studio-version.
|
|
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
|
|
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
|
|
--- a/build/moz.configure/toolchain.configure
|
|
--- a/build/moz.configure/toolchain.configure
|
|
+++ b/build/moz.configure/toolchain.configure
|
|
+++ b/build/moz.configure/toolchain.configure
|
|
-@@ -535,17 +535,17 @@ def get_vc_paths(topsrcdir):
|
|
|
|
|
|
+@@ -542,17 +542,17 @@ def get_vc_paths(topsrcdir):
|
|
)
|
|
)
|
|
tools_path = os.path.join(path, r"VC\Tools\MSVC", tools_version)
|
|
tools_path = os.path.join(path, r"VC\Tools\MSVC", tools_version)
|
|
yield (Version(install["installationVersion"]), tools_path)
|
|
yield (Version(install["installationVersion"]), tools_path)
|
|
@@ -26,7 +26,7 @@ diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolc
|
|
@depends_if("--with-visual-studio-version", when=host_is_windows)
|
|
@depends_if("--with-visual-studio-version", when=host_is_windows)
|
|
def vs_version(value):
|
|
def vs_version(value):
|
|
return value[0]
|
|
return value[0]
|
|
-@@ -605,17 +605,17 @@ def vc_compiler_paths_for_version(host,
|
|
|
|
|
|
+@@ -612,17 +612,17 @@ def vc_compiler_paths_for_version(host,
|
|
elif host.kernel != "WINNT":
|
|
elif host.kernel != "WINNT":
|
|
# Don't try to do anything when VC_PATH is not set on cross-compiles.
|
|
# Don't try to do anything when VC_PATH is not set on cross-compiles.
|
|
return
|
|
return
|