about summary refs log tree commit diff
path: root/src/bootstrap/bootstrap.py
diff options
context:
space:
mode:
authorStepan Koltsov <stepan.koltsov@gmail.com>2017-06-21 19:01:24 +0300
committerStepan Koltsov <stepan.koltsov@gmail.com>2017-06-21 19:01:24 +0300
commitf441e07feb0d8421beaedc5223478bb6e08a5462 (patch)
tree1a27c03cc0a6b00fe9ee5a60d30ee8bc935d69c0 /src/bootstrap/bootstrap.py
parent29bce6e220f6fd2292d13d65fe503af7bf4852b7 (diff)
downloadrust-f441e07feb0d8421beaedc5223478bb6e08a5462.tar.gz
rust-f441e07feb0d8421beaedc5223478bb6e08a5462.zip
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.
Diffstat (limited to 'src/bootstrap/bootstrap.py')
-rw-r--r--src/bootstrap/bootstrap.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 1d3b77916d6..8dc2875ec42 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -668,6 +668,7 @@ def bootstrap():
     env["BUILD"] = rb.build
     env["SRC"] = rb.rust_root
     env["BOOTSTRAP_PARENT_ID"] = str(os.getpid())
+    env["BOOTSTRAP_PYTHON"] = sys.executable
     run(args, env=env, verbose=rb.verbose)