Commit 15f3df0f authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

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

parent 18174a2b

build/moz.configure/init.configure

+2 −2
Original line number Diff line number Diff line
@@ -493,11 +493,11 @@ def split_triplet(triplet, allow_wasi=False): 
        canonical_kernel = "kFreeBSD"

    elif os.startswith("gnu"):

        canonical_os = canonical_kernel = "GNU"

    elif os in ("windows-msvc", "windows-gnu"):

    elif os in ("windows-msvc", "windows-gnu", "windows-gnullvm"):

        canonical_os = canonical_kernel = "WINNT"

        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
@@ -308,9 +308,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 = [