Pass path to python from bootstrap.py to bootstrap.rs #42805
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When bootstrap is executed with python not in `$PATH`, (e. g. `c:\Python27\python.exe x.py test`) bootstrap cannot find python and crashes. This commit passes path to python in `BOOTSTRAP_PYTHON` env var.
|
(rust_highfive has picked a reviewer for you, use r? to override) |
src/bootstrap/sanity.rs
Outdated
| match env::var("BOOTSTRAP_PYTHON") { | ||
| Ok(v) => build.config.python = Some(PathBuf::from(v)), | ||
| Err(env::VarError::NotPresent) => {} | ||
| Err(e) => panic!("BOOTSTRAP_PYTHON var is incorrect: {:?}", e), |
There was a problem hiding this comment.
I don't think there's any reason for us to use env::var (that is, invalid UTF-8 for the python path seems fine -- we store a PathBuf). That should make this case impossible, I think.
There was a problem hiding this comment.
Good point, thanks! I've updated the PR.
stepancheg
force-pushed
the
forward-python
branch
from
664e362 to
f441e07
Compare
|
This looks good to me, but r? @alexcrichton |
Mark-Simulacrum
approved these changes
Jun 21, 2017
|
@bors: r+ |
|
📌 Commit f441e07 has been approved by |
|
@bors rollup |
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Jun 22, 2017
…ichton Pass path to python from bootstrap.py to bootstrap.rs When bootstrap is executed with python not in `$PATH`, (e. g. `c:\Python27\python.exe x.py test`) bootstrap cannot find python and crashes. This commit passes path to python in `BOOTSTRAP_PYTHON` env var.
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Jun 22, 2017
…ichton Pass path to python from bootstrap.py to bootstrap.rs When bootstrap is executed with python not in `$PATH`, (e. g. `c:\Python27\python.exe x.py test`) bootstrap cannot find python and crashes. This commit passes path to python in `BOOTSTRAP_PYTHON` env var.
Mark-Simulacrum
added a commit
to Mark-Simulacrum/rust
that referenced
this pull request
Jun 22, 2017
…ichton Pass path to python from bootstrap.py to bootstrap.rs When bootstrap is executed with python not in `$PATH`, (e. g. `c:\Python27\python.exe x.py test`) bootstrap cannot find python and crashes. This commit passes path to python in `BOOTSTRAP_PYTHON` env var.
alexcrichton
added
the
S-waiting-on-bors
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When bootstrap is executed with python not in
$PATH, (e. g.c:\Python27\python.exe x.py test) bootstrap cannot find pythonand crashes.
This commit passes path to python in
BOOTSTRAP_PYTHONenv var.Fixes #41647.