actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-04-21 13:08:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Detect *-pc-windows-gnu targets in targets

Browse source 
And add fallback `*-pc-windows-msvc` to the returned targets.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-06-23 13:59:53 +10:00
parent c36f1fe08a
commit 8bc0f11569
No known key found for this signature in database
GPG key ID: 591C0B03040416D6
1 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/target.rs
View file

@ -32,6 +32,11 @@ pub async fn detect_targets() -> Vec<String> {
v.push(macos::X86.into()); v.push(macos::X86.into());
} }
#[cfg(target_os = "windows")]
if v[0].contains("gnu") {
v.push(v[0].replace("gnu", "msvc"));
}
v v
} else { } else {
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
@ -42,7 +47,11 @@ pub async fn detect_targets() -> Vec<String> {
{ {
macos::detect_targets_macos() macos::detect_targets_macos()
} }
#[cfg(not(any(target_os = "linux", target_os = "macos")))] #[cfg(target_os = "windows")]
{
windows::detect_targets_windows()
}
#[cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows")))]
{ {
vec![TARGET.into()] vec![TARGET.into()]
} }
@ -145,3 +154,19 @@ mod macos {
} }
} }
} }
#[cfg(target_os = "windows")]
mod windows {
use super::TARGET;
use guess_host_triple::guess_host_triple;
pub(super) fn detect_targets_windows() -> Vec<String> {
let mut targets = vec![guess_host_triple().unwrap_or(TARGET).to_string()];
if targets[0].contains("gnu") {
targets.push(targets[0].replace("gnu", "msvc"));
}
targets
}
}