Skip to content

Compare against CARGO_CFG_TARGET_FAMILY in a multi-valued fashion #1026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 22, 2025
Merged

Compare against CARGO_CFG_TARGET_FAMILY in a multi-valued fashion #1026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions crates/musl-math-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ fn main() {
let cfg = Config::from_env();

if cfg.target_env == "msvc"
|| cfg.target_family == "wasm"
|| cfg.target_families.iter().any(|f| f == "wasm")
|| cfg.target_features.iter().any(|f| f == "thumb-mode")
{
println!(
Expand All @@ -69,7 +69,7 @@ struct Config {
musl_arch: String,
target_arch: String,
target_env: String,
target_family: String,
target_families: Vec<String>,
target_os: String,
target_string: String,
target_vendor: String,
Expand All @@ -79,6 +79,9 @@ struct Config {
impl Config {
fn from_env() -> Self {
let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
let target_families = env::var("CARGO_CFG_TARGET_FAMILY")
.map(|feats| feats.split(',').map(ToOwned::to_owned).collect())
.unwrap_or_default();
let target_features = env::var("CARGO_CFG_TARGET_FEATURE")
.map(|feats| feats.split(',').map(ToOwned::to_owned).collect())
.unwrap_or_default();
Expand All @@ -104,7 +107,7 @@ impl Config {
musl_arch,
target_arch,
target_env: env::var("CARGO_CFG_TARGET_ENV").unwrap(),
target_family: env::var("CARGO_CFG_TARGET_FAMILY").unwrap(),
target_families,
target_os: env::var("CARGO_CFG_TARGET_OS").unwrap(),
target_string: env::var("TARGET").unwrap(),
target_vendor: env::var("CARGO_CFG_TARGET_VENDOR").unwrap(),
Expand Down
7 changes: 5 additions & 2 deletions libm/configure.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub struct Config {
pub target_triple: String,
pub target_arch: String,
pub target_env: String,
pub target_family: Option<String>,
pub target_families: Vec<String>,
pub target_os: String,
pub target_string: String,
pub target_vendor: String,
Expand All @@ -25,6 +25,9 @@ pub struct Config {
impl Config {
pub fn from_env() -> Self {
let target_triple = env::var("TARGET").unwrap();
let target_families = env::var("CARGO_CFG_TARGET_FAMILY")
.map(|feats| feats.split(',').map(ToOwned::to_owned).collect())
.unwrap_or_default();
let target_features = env::var("CARGO_CFG_TARGET_FEATURE")
.map(|feats| feats.split(',').map(ToOwned::to_owned).collect())
.unwrap_or_default();
Expand All @@ -41,7 +44,7 @@ impl Config {
cargo_features,
target_arch: env::var("CARGO_CFG_TARGET_ARCH").unwrap(),
target_env: env::var("CARGO_CFG_TARGET_ENV").unwrap(),
target_family: env::var("CARGO_CFG_TARGET_FAMILY").ok(),
target_families,
target_os: env::var("CARGO_CFG_TARGET_OS").unwrap(),
target_string: env::var("TARGET").unwrap(),
target_vendor: env::var("CARGO_CFG_TARGET_VENDOR").unwrap(),
Expand Down
Loading