make toolchain matching more strict

this picks a toolchain that matches the actual target we're building
instead of just the first toolchain in the list (which with the addition
of -emc toolchain causes things to break).
This commit is contained in:
bunnie 2026-02-11 01:02:13 +08:00
parent fae35dd9f5
commit 41ea75953d

View file

@ -270,16 +270,30 @@ pub(crate) fn ensure_compiler(
}, },
}; };
let first_asset = match assets.first() { // Find the asset that matches the target architecture
None => continue, let matching_asset = assets.iter().find(|asset| {
Some(s) => s, asset
}; .get("name")
.and_then(|n| n.as_str())
.map(|name| {
// Extract the toolchain prefix (everything before the version number)
if let Some(toolchain_prefix) = name.split('_').next() {
target.starts_with(toolchain_prefix)
} else {
false
}
})
.unwrap_or(false)
});
let download_url = match first_asset.get("browser_download_url") { let download_url = match matching_asset {
None => continue, None => continue,
Some(s) => match s.as_str() { Some(asset) => match asset.get("browser_download_url") {
None => continue, None => continue,
Some(s) => s, Some(s) => match s.as_str() {
None => continue,
Some(s) => s,
},
}, },
}; };
// println!("Candidate Release: {}", download_url); // println!("Candidate Release: {}", download_url);