Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #26413 - servo:jdm-patch-41, r=asajeffrey

Browse source 
Use PYTHON2 variable for script's codegen.

This makes the python2 dependency a bit more explicit.
This commit is contained in:
bors-servo 2020-05-04 15:22:58 -04:00 • committed by GitHub
commit d1b7b756a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/build.rs
View file

@ -65,7 +65,7 @@ impl<'a> phf_shared::PhfHash for Bytes<'a> {
} }
fn find_python() -> String { fn find_python() -> String {
env::var("PYTHON").ok().unwrap_or_else(|| { env::var("PYTHON2").ok().unwrap_or_else(|| {
let candidates = if cfg!(windows) { let candidates = if cfg!(windows) {
["python2.7.exe", "python27.exe", "python.exe"] ["python2.7.exe", "python27.exe", "python.exe"]
} else { } else {
@ -82,7 +82,7 @@ fn find_python() -> String {
} }
} }
panic!( 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(", ") candidates.join(", ")
) )
}) })