Skip to content

Commit 27dd5e9

Browse files
committed
Rollup merge of #25971 - richo:configurable-python, r=alexcrichton
r? @alexcrichton
2 parents a190394 + de4a1dc commit 27dd5e9

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

configure

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,7 @@ valopt sysconfdir "/etc" "install system configuration files"
582582
valopt datadir "${CFG_PREFIX}/share" "install data"
583583
valopt infodir "${CFG_PREFIX}/share/info" "install additional info"
584584
valopt llvm-root "" "set LLVM root"
585+
valopt python "" "set path to python"
585586
valopt jemalloc-root "" "set directory where libjemalloc_pic.a is located"
586587
valopt build "${DEFAULT_BUILD}" "GNUs ./configure syntax LLVM build triple"
587588
valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path"
@@ -695,7 +696,9 @@ putvar CFG_BOOTSTRAP_KEY
695696
step_msg "looking for build programs"
696697

697698
probe_need CFG_CURLORWGET curl wget
698-
probe_need CFG_PYTHON python2.7 python2.6 python2 python
699+
if [ -z "$CFG_PYTHON_PROVIDED" ]; then
700+
probe_need CFG_PYTHON python2.7 python2.6 python2 python
701+
fi
699702

700703
python_version=$($CFG_PYTHON -V 2>&1)
701704
if [ $(echo $python_version | grep -c '^Python 2\.[4567]') -ne 1 ]; then

0 commit comments

Comments
 (0)