From c6a37266fa14cefa1d486120dec0450c85497f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Mi=C4=85sko?= Date: Sat, 18 Oct 2025 10:43:54 +0200 Subject: [PATCH] Retrieve host tuple using rustc for rustup toolchains A minimal fix to bring back support for toolchains specified with + prefix. --- collector/src/bin/collector.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/collector/src/bin/collector.rs b/collector/src/bin/collector.rs index 7f7c5ab59..c908d5468 100644 --- a/collector/src/bin/collector.rs +++ b/collector/src/bin/collector.rs @@ -826,8 +826,8 @@ fn main_result() -> anyhow::Result { }; let host_target_tuple = match used_rustc { - Some(rustc) => get_host_tuple_from_rustc(&rustc), - None => get_host_tuple_from_rustc("rustc"), + Some(rustc) if !rustc.starts_with("+") => get_host_tuple_from_rustc(&rustc), + _ => get_host_tuple_from_rustc("rustc"), }; // We only unwrap the host tuple in places where we actually need it, to avoid panicking if it // is missing, but we don't really need it.