actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-05-07 04:30:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add alias universal2-apple-darwin to universal-apple-darwin (#919)

Browse source 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2023-03-17 22:30:55 +11:00 • committed by GitHub
parent cc78ff3b90
commit 06b89b2d18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/detect-targets/src/detect/macos.rs
View file

@ -5,6 +5,7 @@ use tokio::process::Command;
const AARCH64: &str = "aarch64-apple-darwin"; const AARCH64: &str = "aarch64-apple-darwin";
const X86: &str = "x86_64-apple-darwin"; const X86: &str = "x86_64-apple-darwin";
const UNIVERSAL: &str = "universal-apple-darwin"; const UNIVERSAL: &str = "universal-apple-darwin";
const UNIVERSAL2: &str = "universal2-apple-darwin";
async fn is_x86_64_supported() -> io::Result<bool> { async fn is_x86_64_supported() -> io::Result<bool> {
let exit_status = Command::new("arch") let exit_status = Command::new("arch")
@ -24,9 +25,10 @@ pub(super) async fn detect_alternative_targets(target: &str) -> impl Iterator<It
AARCH64 => [ AARCH64 => [
is_x86_64_supported().await.unwrap_or(false).then_some(X86), is_x86_64_supported().await.unwrap_or(false).then_some(X86),
Some(UNIVERSAL), Some(UNIVERSAL),
Some(UNIVERSAL2),
], ],
X86 => [Some(UNIVERSAL), None], X86 => [Some(UNIVERSAL), Some(UNIVERSAL2), None],
_ => [None, None], _ => [None, None, None],
} }
.into_iter() .into_iter()
.flatten() .flatten()