[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/mullvad-browser][mullvad-browser-128.0esr-14.0-1] Bug 29320: Replace the gnu target with gnullvm for Rust.

Title: GitLab

Pier Angelo Vendrame pushed to branch mullvad-browser-128.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser

Commits:

  • 1f329b97
    by Pier Angelo Vendrame at 2024-07-17T18:52:17+02:00 
    Bug 29320: Replace the gnu target with gnullvm for Rust.

2 changed files:

Changes:

  • build/moz.configure/init.configure
    ... ... @@ -510,12 +510,16 @@ def split_triplet(triplet, allow_wasi=False):
    510 510 
             canonical_kernel = "kFreeBSD"
    511 511 
         elif os.startswith("gnu"):
    512 512 
             canonical_os = canonical_kernel = "GNU"
    513 
    -    elif os.startswith("mingw") or os in ("windows-msvc", "windows-gnu"):
    513 
    +    elif os.startswith("mingw") or os in (
    514 
    +        "windows-msvc",
    515 
    +        "windows-gnu",
    516 
    +        "windows-gnullvm",
    517 
    +    ):
    514 518 
             canonical_os = canonical_kernel = "WINNT"
    515 519 
             if not os.startswith("mingw"):
    516 520 
                 if os == "windows-msvc":
    517 521 
                     abi = "msvc"
    518 
    -            elif os == "windows-gnu":
    522 
    +            elif os == "windows-gnu" or os == "windows-gnullvm":
    519 523 
                     abi = "mingw"
    520 524 
                 # Many things down the line are looking for the string "mingw32"
    521 525 
                 # until they are all fixed, we pretend that's the raw os we had

  • build/moz.configure/rust.configure
    ... ... @@ -310,9 +310,9 @@ def detect_rustc_target(
    310 310 
                     if host_or_target.abi == "msvc":
    311 311 
                         suffix = "windows-msvc"
    312 312 
                     elif host_or_target.abi == "mingw":
    313 
    -                    suffix = "windows-gnu"
    313 
    +                    suffix = "windows-gnullvm"
    314 314 
                 elif compiler_info.type in ("gcc", "clang"):
    315 
    -                suffix = "windows-gnu"
    315 
    +                suffix = "windows-gnullvm"
    316 316 
                 else:
    317 317 
                     suffix = "windows-msvc"
    318 318 
                 narrowed = [

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits