Only check IS_OSX in install_pypy if PLAT is x86_64

common_utils.sh

@@ -440,18 +440,18 @@ function install_pypy {
     # sets $PYTHON_EXE variable to python executable
 
     local version=$1
-    if [ -n "$IS_OSX" ]; then
-       suffix="osx64"
-    else
-       case "$PLAT" in
-       "x86_64")  suffix="linux64";;
-       "i686")    suffix="linux32";;
-       "ppc64le") suffix="ppc64le";;
-       "s390x")   suffix="s390x";;
-       "aarch64") suffix="aarch64";;
-       *) echo unknown platform "$PLAT"; exit 1;;
-       esac
-    fi
+    case "$PLAT" in
+    "x86_64")  if [ -n "$IS_OSX" ]; then
+                   suffix="osx64";
+               else
+                   suffix="linux64";
+               fi;;
+    "i686")    suffix="linux32";;
+    "ppc64le") suffix="ppc64le";;
+    "s390x")    suffix="s390x";;
+    "aarch64")  suffix="aarch64";;
+    *) echo unknown platform "$PLAT"; exit 1;;
+    esac
 
     # 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)

tests/test_multibuild.sh

@@ -19,6 +19,7 @@ unset PYTHON_EXE
 if [ -n "$IS_OSX" ]; then
     source osx_utils.sh
     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
     source tests/test_python_install.sh