Skip to content

GitLab

Commit f9529163 authored by Andrew Murray's avatar Andrew Murray
Browse files

Only check IS_OSX in install_pypy if PLAT is x86_64

parent 9bc47051
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 12 deletions
common_utils.sh
View file @ f9529163
...@@ -440,18 +440,18 @@ function install_pypy { ...@@ -440,18 +440,18 @@ function install_pypy {
# sets $PYTHON_EXE variable to python executable # sets $PYTHON_EXE variable to python executable
local version=$1 local version=$1
if [ -n "$IS_OSX" ]; then case "$PLAT" in
suffix="osx64" "x86_64") if [ -n "$IS_OSX" ]; then
else suffix="osx64";
case "$PLAT" in else
"x86_64") suffix="linux64";; suffix="linux64";
"i686") suffix="linux32";; fi;;
"ppc64le") suffix="ppc64le";; "i686") suffix="linux32";;
"s390x") suffix="s390x";; "ppc64le") suffix="ppc64le";;
"aarch64") suffix="aarch64";; "s390x") suffix="s390x";;
*) echo unknown platform "$PLAT"; exit 1;; "aarch64") suffix="aarch64";;
esac *) echo unknown platform "$PLAT"; exit 1;;
fi esac
# Need to convert pypy-7.2 to pypy2.7-v7.2.0 and pypy3.6-7.3 to pypy3.6-v7.3.0 # Need to convert pypy-7.2 to pypy2.7-v7.2.0 and pypy3.6-7.3 to pypy3.6-v7.3.0
local prefix=$(get_pypy_build_prefix $version) local prefix=$(get_pypy_build_prefix $version)
......
tests/test_multibuild.sh
View file @ f9529163
...@@ -19,6 +19,7 @@ unset PYTHON_EXE ...@@ -19,6 +19,7 @@ unset PYTHON_EXE
if [ -n "$IS_OSX" ]; then if [ -n "$IS_OSX" ]; then
source osx_utils.sh source osx_utils.sh
MB_PYTHON_OSX_VER=${MB_PYTHON_OSX_VER:-$(macpython_sdk_for_version $MB_PYTHON_VERSION)} MB_PYTHON_OSX_VER=${MB_PYTHON_OSX_VER:-$(macpython_sdk_for_version $MB_PYTHON_VERSION)}
PLAT=${PLAT:-$(macpython_arch_for_version $MB_PYTHON_VERSION)}
get_macpython_environment $MB_PYTHON_VERSION ${VENV:-""} $MB_PYTHON_OSX_VER get_macpython_environment $MB_PYTHON_VERSION ${VENV:-""} $MB_PYTHON_OSX_VER
source tests/test_python_install.sh source tests/test_python_install.sh
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment