From 63c00d99899971c3ed9a3ee01c69b8b3a194e171 Mon Sep 17 00:00:00 2001 From: "Yamashita, Yuu" Date: Wed, 9 Aug 2017 08:10:36 +0000 Subject: [PATCH] Avoid choosing virtualenv when building PyPy from source --- plugins/python-build/bin/pyenv-install | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/python-build/bin/pyenv-install b/plugins/python-build/bin/pyenv-install index 6705d4bc..844b47ec 100755 --- a/plugins/python-build/bin/pyenv-install +++ b/plugins/python-build/bin/pyenv-install @@ -207,8 +207,12 @@ if [ -z "${PYENV_BOOTSTRAP_VERSION}" ]; then else for version in $(pyenv-versions --bare | sort -r); do if [[ "${version}" == "2.7"* ]]; then - PYENV_BOOTSTRAP_VERSION="$version" - break + if [ -f "$(pyenv-prefix "${version}")/bin/activate" ]; then + : # avoid choosing virtualenv since it may not have some necessary modules (e.g. cffi, pycparser) + else + PYENV_BOOTSTRAP_VERSION="$version" + break + fi fi done fi