Moved this too soon, verify_python() expects bin/python to be created first

This commit is contained in:
Samuel Villamonte 2016-10-02 11:38:50 -05:00
parent 858b318779
commit 46bc0b7558
2 changed files with 3 additions and 3 deletions

View file

@ -922,6 +922,9 @@ build_package_pyston() {
mkdir -p "${PREFIX_PATH}/" mkdir -p "${PREFIX_PATH}/"
cp -fR . "${PREFIX_PATH}/" cp -fR . "${PREFIX_PATH}/"
chmod +x "${PREFIX_PATH}/"pyston chmod +x "${PREFIX_PATH}/"pyston
# FIXME ugly hack below adapted from
# https://github.com/dropbox/pyston/blob/master/docker/pyston/Dockerfile
( cd "${PREFIX_PATH}/" && ./pyston virtualenv/virtualenv.py . )
} }
build_package_ironpython() { build_package_ironpython() {

View file

@ -5,9 +5,6 @@ case "$(pyston_architecture 2>/dev/null || true)" in
# pyston targets python 2.7.7 and does not have ensurepip, when attempting to # pyston targets python 2.7.7 and does not have ensurepip, when attempting to
# run https://bootstrap.pypa.io/get-pip.py it dumps core, see # run https://bootstrap.pypa.io/get-pip.py it dumps core, see
# https://github.com/dropbox/pyston/issues/1373 # https://github.com/dropbox/pyston/issues/1373
# FIXME ugly hack below adapted from
# https://github.com/dropbox/pyston/blob/master/docker/pyston/Dockerfile
( cd "${PREFIX_PATH}/" && ./pyston virtualenv/virtualenv.py . )
# activate the virtualenv so that we're using the correct pip and site-packages location # activate the virtualenv so that we're using the correct pip and site-packages location
( source "${PREFIX_PATH}/bin/activate" ) ( source "${PREFIX_PATH}/bin/activate" )
# FIXME: if this fails it should not break the installation # FIXME: if this fails it should not break the installation