aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <servo-ops@mozilla.com>2020-05-04 15:22:58 -0400
committerGitHub <noreply@github.com>2020-05-04 15:22:58 -0400
commitd1b7b756a7e6dff01975ab0c3634653efe54bc16 (patch)
treeff6c8ff0147456ad4cb7390d31d7d26e7a251ad0
parent90e07d06c71a05dd5335bc9a1f3d0043ca430aff (diff)
parent0148cc5cf90bf26c32c6481b13120664e5bc50a4 (diff)
downloadservo-d1b7b756a7e6dff01975ab0c3634653efe54bc16.tar.gz
servo-d1b7b756a7e6dff01975ab0c3634653efe54bc16.zip
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.
-rw-r--r--components/script/build.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/build.rs b/components/script/build.rs
index d8d65b098db..6a9b4866759 100644
--- a/components/script/build.rs
+++ b/components/script/build.rs
@@ -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(", ")
)
})