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

Merge pull request #1097 from kngwyu/refactor-buildrs

Browse source 
Refactor build.rs
This commit is contained in:
Yuji Kanagawa 2020-08-09 18:31:19 +09:00 committed by GitHub
parent b71018689d 5ae8639cc8
commit ff9cde46e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
build.rs
View file

@ -356,19 +356,11 @@ else:
fn get_rustc_link_lib(config: &InterpreterConfig) -> Result<String> { fn get_rustc_link_lib(config: &InterpreterConfig) -> Result<String> {
// os x can be linked to a framework or static or dynamic, and // os x can be linked to a framework or static or dynamic, and
// Py_ENABLE_SHARED is wrong; framework means shared library // Py_ENABLE_SHARED is wrong; framework means shared library
let link_name = get_library_link_name(&config.version, &config.ld_version);
match get_macos_linkmodel(config)?.as_ref() { match get_macos_linkmodel(config)?.as_ref() {
"static" => Ok(format!( "static" => Ok(format!("cargo:rustc-link-lib=static={}", link_name,)),
"cargo:rustc-link-lib=static={}", "shared" => Ok(format!("cargo:rustc-link-lib={}", link_name)),
get_library_link_name(&config.version, &config.ld_version) "framework" => Ok(format!("cargo:rustc-link-lib={}", link_name,)),
)),
"shared" => Ok(format!(
"cargo:rustc-link-lib={}",
get_library_link_name(&config.version, &config.ld_version)
)),
"framework" => Ok(format!(
"cargo:rustc-link-lib={}",
get_library_link_name(&config.version, &config.ld_version)
)),
other => bail!("unknown linkmodel {}", other), other => bail!("unknown linkmodel {}", other),
} }
} }
@ -382,6 +374,28 @@ fn get_rustc_link_lib(config: &InterpreterConfig) -> Result<String> {
)) ))
} }
fn find_interpreter() -> Result<PathBuf> {
if let Some(exe) = env::var_os("PYO3_PYTHON") {
Ok(exe.into())
} else if let Some(exe) = env::var_os("PYTHON_SYS_EXECUTABLE") {
// Backwards-compatible name for PYO3_PYTHON; this may be removed at some point in the future.
Ok(exe.into())
} else {
["python", "python3"]
.iter()
.find(|bin| {
if let Ok(out) = Command::new(bin).arg("--version").output() {
// begin with `Python 3.X.X :: additional info`
out.stdout.starts_with(b"Python 3") || out.stderr.starts_with(b"Python 3")
} else {
false
}
})
.map(PathBuf::from)
.ok_or("Python 3.x interpreter not found".into())
}
}
/// Locate a suitable python interpreter and extract config from it. /// Locate a suitable python interpreter and extract config from it.
/// ///
/// The following locations are checked in the order listed: /// The following locations are checked in the order listed:
@ -394,27 +408,7 @@ fn get_rustc_link_lib(config: &InterpreterConfig) -> Result<String> {
/// ///
/// If none of the above works, an error is returned /// If none of the above works, an error is returned
fn find_interpreter_and_get_config() -> Result<(InterpreterConfig, HashMap<String, String>)> { fn find_interpreter_and_get_config() -> Result<(InterpreterConfig, HashMap<String, String>)> {
let python_interpreter = if let Some(exe) = env::var_os("PYO3_PYTHON") { let python_interpreter = find_interpreter()?;
exe.into()
} else if let Some(exe) = env::var_os("PYTHON_SYS_EXECUTABLE") {
// Backwards-compatible name for PYO3_PYTHON; this may be removed at some point in the future.
exe.into()
} else {
PathBuf::from(
["python", "python3"]
.iter()
.find(|bin| {
if let Ok(out) = Command::new(bin).arg("--version").output() {
// begin with `Python 3.X.X :: additional info`
out.stdout.starts_with(b"Python 3") || out.stderr.starts_with(b"Python 3")
} else {
false
}
})
.ok_or("Python 3.x interpreter not found")?,
)
};
let interpreter_config = get_config_from_interpreter(&python_interpreter)?; let interpreter_config = get_config_from_interpreter(&python_interpreter)?;
if interpreter_config.version.major == 3 { if interpreter_config.version.major == 3 {
return Ok((interpreter_config, get_config_vars(&python_interpreter)?)); return Ok((interpreter_config, get_config_vars(&python_interpreter)?));
@ -426,7 +420,6 @@ fn find_interpreter_and_get_config() -> Result<(InterpreterConfig, HashMap<Strin
/// Extract compilation vars from the specified interpreter. /// Extract compilation vars from the specified interpreter.
fn get_config_from_interpreter(interpreter: &Path) -> Result<InterpreterConfig> { fn get_config_from_interpreter(interpreter: &Path) -> Result<InterpreterConfig> {
let script = r#" let script = r#"
import json
import platform import platform
import struct import struct
import sys import sys