mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Auto merge of #26413 - servo:jdm-patch-41, r=asajeffrey
Use PYTHON2 variable for script's codegen. This makes the python2 dependency a bit more explicit.
This commit is contained in:
commit
d1b7b756a7
1 changed files with 2 additions and 2 deletions
|
@ -65,7 +65,7 @@ impl<'a> phf_shared::PhfHash for Bytes<'a> {
|
|||
}
|
||||
|
||||
fn find_python() -> String {
|
||||
env::var("PYTHON").ok().unwrap_or_else(|| {
|
||||
env::var("PYTHON2").ok().unwrap_or_else(|| {
|
||||
let candidates = if cfg!(windows) {
|
||||
["python2.7.exe", "python27.exe", "python.exe"]
|
||||
} else {
|
||||
|
@ -82,7 +82,7 @@ fn find_python() -> String {
|
|||
}
|
||||
}
|
||||
panic!(
|
||||
"Can't find python (tried {})! Try fixing PATH or setting the PYTHON env var",
|
||||
"Can't find python (tried {})! Try fixing PATH or setting the PYTHON2 env var",
|
||||
candidates.join(", ")
|
||||
)
|
||||
})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue