about summary refs log tree commit diff
path: root/config.toml.example
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-03-09 17:18:18 +0100
committerGitHub <noreply@github.com>2019-03-09 17:18:18 +0100
commit3f872b209ba573e28053885e9fc4a86581fb82ea (patch)
treeea06e4fa02f141bbb05874fe721abbd51dfa395e /config.toml.example
parent0c4cb48e03af0cc7481b76ada343c092bf6dfdfd (diff)
parent12d8a7d64e0c70a33dea591f7158aad38b1563c5 (diff)
downloadrust-3f872b209ba573e28053885e9fc4a86581fb82ea.tar.gz
rust-3f872b209ba573e28053885e9fc4a86581fb82ea.zip
Rollup merge of #58676 - euclio:bootstrap-python, r=alexcrichton
look for python2 symlinks before bootstrap python

Before this commit, if you're running x.py directly on a system where
`python` is symlinked to Python 3, then the `python` config option will
default to a Python 3 interpreter. This causes debuginfo tests to fail
with an opaque error message, since they have a hard requirement on
Python 2.

This commit modifies the Python probe behavior to look for python2.7 and
python2 *before* using the interpreter used to execute `x.py`.
Diffstat (limited to 'config.toml.example')
-rw-r--r--config.toml.example3
1 files changed, 3 insertions, 0 deletions
diff --git a/config.toml.example b/config.toml.example
index 0631d7c83ea..9afbd937c42 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -164,6 +164,9 @@
 # Python interpreter to use for various tasks throughout the build, notably
 # rustdoc tests, the lldb python interpreter, and some dist bits and pieces.
 # Note that Python 2 is currently required.
+#
+# Defaults to python2.7, then python2. If neither executable can be found, then
+# it defaults to the Python interpreter used to execute x.py.
 #python = "python2.7"
 
 # Force Cargo to check that Cargo.lock describes the precise dependency