Skip to content
Snippets Groups Projects
Verified Commit 70d0346a authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame :jack_o_lantern:
Browse files

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

parent 67a2bcb5
No related branches found
No related tags found
2 merge requests!1202Bug_43099: 2024 YEC Strings,!1136Bug 43085: Rebased alpha onto 128.2.0esr
......@@ -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
......
......@@ -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 = [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment