tor-browser

commit cea91446f19832a801aa7cbbc1bf442db1193ab5
parent 1b93711736289471493ad12d73e48ee1440641cd
Author: Martin Bruse <zondolfin@gmail.com>
Date:   Tue, 28 Oct 2025 07:04:07 +0000

Bug 1994380 - Make toolchain.configure able to figure out WASM compiler based on clang-cl.exe. r=glandium

Differential Revision: https://phabricator.services.mozilla.com/D268672

Diffstat:
M
build/moz.configure/toolchain.configure
 | 
12
++++++++++++

1 file changed, 12 insertions(+), 0 deletions(-)
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
@@ -1142,6 +1142,18 @@ def default_c_compilers(host_or_target, other_c_compiler=None):
             supported = types = ("clang", "gcc")
 
         info = other_c_compiler[0] if other_c_compiler else None
+
+        if (
+            info
+            and info.type == "clang-cl"
+            and "clang-cl" not in supported
+            and "clang" in supported
+        ):
+            dir_path = os.path.dirname(info.compiler)
+            basename = os.path.basename(info.compiler)
+            clang_name = basename.replace("clang-cl", "clang")
+            info = namespace(compiler=os.path.join(dir_path, clang_name), type="clang")
+
         if info and info.type in supported:
             # When getting default C compilers for the host, we prioritize the
             # same compiler as the target C compiler.