Verified Commit 6757e591 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by ma1
Browse files

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

parent 6ccd684e

build/moz.configure/init.configure

+6 −2
Original line number Diff line number Diff line
@@ -510,12 +510,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

build/moz.configure/rust.configure

+2 −2
Original line number Diff line number Diff line
@@ -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 = [