Support systems which don't have a "python" command. (#386)

Add support for finding an appropriate python command on systems which
don't have "python". Try "python3" and "python2.7".

Fixed #381.
This commit is contained in:
Dan Gohman
2018-07-02 13:02:00 -07:00
committed by GitHub
parent 1074e2c755
commit 276ba8b97d
3 changed files with 19 additions and 4 deletions

View File

@@ -26,6 +26,7 @@ fn main() {
let target_triple = env::var("TARGET").expect("The TARGET environment variable must be set");
let cretonne_targets = env::var("CRETONNE_TARGETS").ok();
let cretonne_targets = cretonne_targets.as_ref().map(|s| s.as_ref());
let python = identify_python();
// Configure isa targets cfg.
match isa_targets(cretonne_targets, &target_triple) {
@@ -60,7 +61,7 @@ fn main() {
// Launch build script with Python. We'll just find python in the path.
// Use -B to disable .pyc files, because they cause trouble for vendoring
// scripts, and this is a build step that isn't run very often anyway.
let status = process::Command::new("python")
let status = process::Command::new(python)
.current_dir(crate_dir)
.arg("-B")
.arg(build_script)
@@ -73,6 +74,19 @@ fn main() {
}
}
fn identify_python() -> &'static str {
for python in &["python", "python3", "python2.7"] {
if process::Command::new(python)
.arg("--version")
.status()
.is_ok()
{
return python;
}
}
panic!("The Cretonne build requires Python (version 2.7 or version 3)");
}
/// Represents known ISA target.
#[derive(Copy, Clone)]
enum Isa {