Unverified Commit 9d0f6698 authored by Isuru Fernando's avatar Isuru Fernando Committed by GitHub
Browse files

Merge pull request #414 from radarhere/cleanup

Only determine py_osx_ver when necessary
parents a980404f f85c8502
...@@ -154,7 +154,6 @@ function pyinst_fname_for_version { ...@@ -154,7 +154,6 @@ function pyinst_fname_for_version {
# built for, eg: "10.6" or "10.9", if not defined, infers # built for, eg: "10.6" or "10.9", if not defined, infers
# this from $py_version using macpython_sdk_for_version # this from $py_version using macpython_sdk_for_version
local py_version=$1 local py_version=$1
local py_osx_ver=${2:-$(macpython_sdk_for_version $py_version)}
local inst_ext=$(pyinst_ext_for_version $py_version) local inst_ext=$(pyinst_ext_for_version $py_version)
# Use the universal2 installer if we are on arm64 # Use the universal2 installer if we are on arm64
# universal2 installer for python 3.8 needs macos 11.0 to run on # universal2 installer for python 3.8 needs macos 11.0 to run on
...@@ -170,6 +169,7 @@ function pyinst_fname_for_version { ...@@ -170,6 +169,7 @@ function pyinst_fname_for_version {
echo "python-${py_version}-macos11.${inst_ext}" echo "python-${py_version}-macos11.${inst_ext}"
fi fi
else else
local py_osx_ver=${2:-$(macpython_sdk_for_version $py_version)}
echo "python-${py_version}-macosx${py_osx_ver}.${inst_ext}" echo "python-${py_version}-macosx${py_osx_ver}.${inst_ext}"
fi fi
} }
......
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