diff options
| author | Joshua Nelson <jnelson@cloudflare.com> | 2022-03-29 13:50:17 -0500 |
|---|---|---|
| committer | Joshua Nelson <jnelson@cloudflare.com> | 2022-03-29 13:50:17 -0500 |
| commit | f5fb293295241e64d745ed63da5c603eed0ebc22 (patch) | |
| tree | b77324d4e88e6c86fe7b397aa392c1850a1b8a3d /src/tools/x | |
| parent | 11909e3588319235e28e99294e17cca11db1d7e2 (diff) | |
| download | rust-f5fb293295241e64d745ed63da5c603eed0ebc22.tar.gz rust-f5fb293295241e64d745ed63da5c603eed0ebc22.zip | |
Clarify how `src/tools/x` searches for python
Diffstat (limited to 'src/tools/x')
| -rw-r--r-- | src/tools/x/src/main.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/tools/x/src/main.rs b/src/tools/x/src/main.rs index 8c47559b369..57d548f313d 100644 --- a/src/tools/x/src/main.rs +++ b/src/tools/x/src/main.rs @@ -26,6 +26,7 @@ fn python() -> &'static str { let mut python3 = false; for dir in env::split_paths(&val) { + // `python` should always take precedence over python2 / python3 if it exists if dir.join(PYTHON).exists() { return PYTHON; } @@ -34,11 +35,14 @@ fn python() -> &'static str { python3 |= dir.join(PYTHON3).exists(); } + // try 3 before 2 if python3 { PYTHON3 } else if python2 { PYTHON2 } else { + // We would have returned early if we found that python is installed ... + // maybe this should panic with an error instead? PYTHON } } |
