From f48fabc1f1b2d29ec65756e352c657276b7b3137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 6 Nov 2014 11:39:00 +0100 Subject: [PATCH] Autodetect cython2 version --- distribute.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/distribute.sh b/distribute.sh index d77d1a571e..b14ab3e51c 100755 --- a/distribute.sh +++ b/distribute.sh @@ -42,6 +42,12 @@ if [ "X$VIRTUALENV_NAME" == "X" ]; then VIRTUALENV_NAME="$(which virtualenv)" fi +# Resolve Cython path +CYTHON="$(which cython2)" +if [ "X$PYTHON" == "X" ]; then + CYTHON="$(which cython)" +fi + # Paths ROOT_PATH="$(dirname $($PYTHON -c 'from __future__ import print_function; import os,sys;print(os.path.realpath(sys.argv[1]))' $0))" RECIPES_PATH="$ROOT_PATH/recipes" @@ -54,7 +60,7 @@ JNI_PATH="$SRC_PATH/jni" DIST_PATH="$ROOT_PATH/dist/default" SITEPACKAGES_PATH="$BUILD_PATH/python-install/lib/python2.7/site-packages/" HOSTPYTHON="$BUILD_PATH/python-install/bin/python.host" -CYTHON="cython -t" +CYTHON+=" -t" # Tools export LIBLINK_PATH="$BUILD_PATH/objects"