Skip to content

GitLab

Commit 4378c0be authored by Andrew Murray's avatar Andrew Murray
Browse files

Check IS_OSX instead of PLAT in install_pypy

parent f6b46e77
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 13 deletions
common_utils.sh
View file @ 4378c0be
...@@ -440,19 +440,18 @@ function install_pypy { ...@@ -440,19 +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
suffix="osx64"
else
case "$PLAT" in case "$PLAT" in
"x86_64") suffix="linux64";; "x86_64") suffix="linux64";;
"i686") suffix="linux32";; "i686") suffix="linux32";;
"darwin") suffix="osx64";;
"ppc64le") suffix="ppc64le";; "ppc64le") suffix="ppc64le";;
"s390x") suffix="s390x";; "s390x") suffix="s390x";;
"aarch64") suffix="aarch64";; "aarch64") suffix="aarch64";;
*) if [ -n "$IS_OSX" ]; then *) echo unknown platform "$PLAT"; exit 1;;
suffix="osx64";
else
echo unknown platform "$PLAT"; exit 1
fi;;
esac esac
fi
# 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)
......
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