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

Fix macos detection: Use super::TARGET as fallback

Browse source 
When `guess_host_triple` failed to detect the target.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-06-23 19:39:36 +10:00
parent ee4cbaa3d5
commit 536f3b2c6f
No known key found for this signature in database
GPG key ID: 591C0B03040416D6
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/target.rs
View file

@ -141,17 +141,20 @@ mod linux {
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
mod macos { mod macos {
use super::TARGET;
use guess_host_triple::guess_host_triple; use guess_host_triple::guess_host_triple;
pub(super) const AARCH64: &str = "aarch64-apple-darwin"; pub(super) const AARCH64: &str = "aarch64-apple-darwin";
pub(super) const X86: &str = "x86_64-apple-darwin"; pub(super) const X86: &str = "x86_64-apple-darwin";
pub(super) fn detect_targets_macos() -> Vec<String> { pub(super) fn detect_targets_macos() -> Vec<String> {
if guess_host_triple() == Some(AARCH64) { let mut targets = vec![guess_host_triple().unwrap_or(TARGET).to_string()];
vec![AARCH64.into(), X86.into()]
} else { if targets[0] == AARCH64 {
vec![X86.into()] targets.push(X86.into());
} }
targets
} }
} }