luxolus/pyo3
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Clean up CARGO_CFG_TARGET_FAMILY variable parsing

Browse source 
Match the target OS family strings exactly and provide better error messages
when CARGO_CFG_TARGET_FAMILY is not set (e.g. on wasm32).
This commit is contained in:
Sergey Kvachonok 2021-03-29 09:00:57 +03:00
parent 6d6d030bf7
commit f91f795fc7
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build.rs
View file

@ -516,13 +516,15 @@ fn windows_hardcoded_cross_compile(
fn load_cross_compile_info( fn load_cross_compile_info(
cross_compile_config: CrossCompileConfig, cross_compile_config: CrossCompileConfig,
) -> Result<(InterpreterConfig, BuildFlags)> { ) -> Result<(InterpreterConfig, BuildFlags)> {
let target_family = env::var("CARGO_CFG_TARGET_FAMILY")?; match env::var("CARGO_CFG_TARGET_FAMILY") {
// Because compiling for windows on linux still includes the unix target family
if target_family == "unix" {
// Configure for unix platforms using the sysconfigdata file // Configure for unix platforms using the sysconfigdata file
load_cross_compile_from_sysconfigdata(cross_compile_config) Ok(os) if os == "unix" => load_cross_compile_from_sysconfigdata(cross_compile_config),
} else { // Use hardcoded interpreter config when targeting Windows
windows_hardcoded_cross_compile(cross_compile_config) Ok(os) if os == "windows" => windows_hardcoded_cross_compile(cross_compile_config),
// ???
Ok(os) => Err(format!("Unsupported target OS family: {}", os).into()),
// wasm32-wasi / bare metal ?
Err(_) => Err("CARGO_CFG_TARGET_FAMILY is not set when cross-compiling".into()),
} }
} }