dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #25971 - richo:configurable-python, r=alexcrichton 

r? @alexcrichton
This commit is contained in:
Manish Goregaokar 2015-06-03 14:46:41 +05:30
parent a190394ae8 de4a1dca2b
commit 27dd5e9ce9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@ -582,6 +582,7 @@ valopt sysconfdir "/etc" "install system configuration files"
valopt datadir "${CFG_PREFIX}/share" "install data" valopt datadir "${CFG_PREFIX}/share" "install data"
valopt infodir "${CFG_PREFIX}/share/info" "install additional info" valopt infodir "${CFG_PREFIX}/share/info" "install additional info"
valopt llvm-root "" "set LLVM root" valopt llvm-root "" "set LLVM root"
valopt python "" "set path to python"
valopt jemalloc-root "" "set directory where libjemalloc_pic.a is located" valopt jemalloc-root "" "set directory where libjemalloc_pic.a is located"
valopt build "${DEFAULT_BUILD}" "GNUs ./configure syntax LLVM build triple" valopt build "${DEFAULT_BUILD}" "GNUs ./configure syntax LLVM build triple"
valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path" valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path"
@ -695,7 +696,9 @@ putvar CFG_BOOTSTRAP_KEY
step_msg "looking for build programs" step_msg "looking for build programs"
probe_need CFG_CURLORWGET curl wget probe_need CFG_CURLORWGET curl wget
probe_need CFG_PYTHON python2.7 python2.6 python2 python if [ -z "$CFG_PYTHON_PROVIDED" ]; then
probe_need CFG_PYTHON python2.7 python2.6 python2 python
fi
python_version=$($CFG_PYTHON -V 2>&1) python_version=$($CFG_PYTHON -V 2>&1)
if [ $(echo $python_version | grep -c '^Python 2\.[4567]') -ne 1 ]; then if [ $(echo $python_version | grep -c '^Python 2\.[4567]') -ne 1 ]; then