tor-browser

commit 1687350ad249afe8fc88f0941736ea2dffa72f27
parent 9b258abde2b5aae749c7f225b08fb91b94453071
Author: Pier Angelo Vendrame <pierov@torproject.org>
Date:   Thu, 13 Jun 2024 09:22:53 +0200

BB 29320: Replace the gnu target with gnullvm for Rust.

Diffstat:
M
build/moz.configure/init.configure
 | 
8
++++++--
M
build/moz.configure/rust.configure
 | 
4
++--

2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
@@ -490,12 +490,16 @@ def split_triplet(triplet, allow_wasi=False):
         canonical_kernel = "kFreeBSD"
     elif os.startswith("gnu"):
         canonical_os = canonical_kernel = "GNU"
-    elif os.startswith("mingw") or os in ("windows-msvc", "windows-gnu"):
+    elif os.startswith("mingw") or os in (
+        "windows-msvc",
+        "windows-gnu",
+        "windows-gnullvm",
+    ):
         canonical_os = canonical_kernel = "WINNT"
         if not os.startswith("mingw"):
             if os == "windows-msvc":
                 abi = "msvc"
-            elif os == "windows-gnu":
+            elif os == "windows-gnu" or os == "windows-gnullvm":
                 abi = "mingw"
             # Many things down the line are looking for the string "mingw32"
             # until they are all fixed, we pretend that's the raw os we had
diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
@@ -310,9 +310,9 @@ def detect_rustc_target(
                 if host_or_target.abi == "msvc":
                     suffix = "windows-msvc"
                 elif host_or_target.abi == "mingw":
-                    suffix = "windows-gnu"
+                    suffix = "windows-gnullvm"
             elif compiler_info.type in ("gcc", "clang"):
-                suffix = "windows-gnu"
+                suffix = "windows-gnullvm"
             else:
                 suffix = "windows-msvc"
             narrowed = [