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

Fixed #704: Fix get_target_from_rustc for alpine (#705)

Browse source 
On Alpine, rustc returns host triple `x86_64-alpine-linux-musl`, so we
have to adopt code from
[`convert_custom_linux_target`](5519aeb5c2/build-common.rs (L1-L13)) to fix this.

* Optimize `get_target_from_rustc`: Avoid frequent String allocation

caused by `Cursor::new(stdout).lines()` which calls `BufRead::lines` and
returns `Lines` iterator, which returns `Item = io::Result<String>`.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2023-01-16 10:57:53 +11:00 • committed by GitHub
parent abb6874da3
commit d72abde8e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/detect-targets/src/detect.rs
View file

@ -2,7 +2,6 @@ use std::{
borrow::Cow,
env,
ffi::OsStr,
io::{BufRead, Cursor},
process::{Output, Stdio},
};
@ -99,10 +98,26 @@ async fn get_target_from_rustc() -> Option<String> {
return None;
}
Cursor::new(stdout)
let stdout = String::from_utf8_lossy(&stdout);
let target = stdout
.lines()
.filter_map(|line| line.ok())
.find_map(|line| line.strip_prefix("host: ").map(|host| host.to_owned()))
// All valid target triple must be in the form of $arch-$os-$abi.
.filter(|target| target.split('-').count() >= 3)
.find_map(|line| line.strip_prefix("host: "))?;
// The target triplets have the form of 'arch-vendor-system'.
//
// When building for Linux (e.g. the 'system' part is
// 'linux-something'), replace the vendor with 'unknown'
// so that mapping to rust standard targets happens correctly.
//
// For example, alpine set `rustc` host triple to
// `x86_64-alpine-linux-musl`.
//
// Here we use splitn with n=4 since we just need to check
// the third part to see if it equals to "linux" and verify
// that we have at least three parts.
let mut parts: Vec<&str> = target.splitn(4, '-').collect();
if *parts.get(2)? == "linux" {
parts[1] = "unknown";
}
Some(parts.join("-"))
}