Skip to content

Commit c6a3726

Browse files
committed
Retrieve host tuple using rustc for rustup toolchains
A minimal fix to bring back support for toolchains specified with + prefix.
1 parent 3570a10 commit c6a3726

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

collector/src/bin/collector.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -826,8 +826,8 @@ fn main_result() -> anyhow::Result<i32> {
826826
};
827827

828828
let host_target_tuple = match used_rustc {
829-
Some(rustc) => get_host_tuple_from_rustc(&rustc),
830-
None => get_host_tuple_from_rustc("rustc"),
829+
Some(rustc) if !rustc.starts_with("+") => get_host_tuple_from_rustc(&rustc),
830+
_ => get_host_tuple_from_rustc("rustc"),
831831
};
832832
// We only unwrap the host tuple in places where we actually need it, to avoid panicking if it
833833
// is missing, but we don't really need it.

0 commit comments

Comments
 (0)