diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2019-11-21 13:57:40 +0100 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2020-04-10 09:09:58 -0400 |
| commit | 38eb369fa4d06e55869a8fae62796a7b0085a5bd (patch) | |
| tree | a2f010105a6087ba68ff8ca3bf9371633463739d /src/bootstrap | |
| parent | 42abbd8878d3b67238f3611b0587c704ba94f39c (diff) | |
| download | rust-38eb369fa4d06e55869a8fae62796a7b0085a5bd.tar.gz rust-38eb369fa4d06e55869a8fae62796a7b0085a5bd.zip | |
Enforce Python 3 as much as possible
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/job.rs | 7 | ||||
| -rw-r--r-- | src/bootstrap/sanity.rs | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/bootstrap/job.rs b/src/bootstrap/job.rs index efeb86540b7..2fe9b06e426 100644 --- a/src/bootstrap/job.rs +++ b/src/bootstrap/job.rs @@ -103,7 +103,12 @@ pub unsafe fn setup(build: &mut Build) { }; let parent = OpenProcess(PROCESS_DUP_HANDLE, FALSE, pid.parse().unwrap()); - assert!(!parent.is_null(), "{}", io::Error::last_os_error()); + assert!( + !parent.is_null(), + "PID `{}` doesn't seem to exist: {}", + pid, + io::Error::last_os_error() + ); let mut parent_handle = ptr::null_mut(); let r = DuplicateHandle( GetCurrentProcess(), diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs index 530e74da8ca..1760d655b3b 100644 --- a/src/bootstrap/sanity.rs +++ b/src/bootstrap/sanity.rs @@ -132,8 +132,6 @@ pub fn check(build: &mut Build) { .python .take() .map(|p| cmd_finder.must_have(p)) - .or_else(|| cmd_finder.maybe_have("python2.7")) - .or_else(|| cmd_finder.maybe_have("python2")) .or_else(|| env::var_os("BOOTSTRAP_PYTHON").map(PathBuf::from)) // set by bootstrap.py .or_else(|| Some(cmd_finder.must_have("python"))); |