Commit 65a4ae39 authored by Isuru Fernando's avatar Isuru Fernando
Browse files

fix MB_PYTHON_OSX_VER for universal2 wheels

parent 2de4617d
...@@ -103,7 +103,7 @@ function macpython_sdk_list_for_version { ...@@ -103,7 +103,7 @@ function macpython_sdk_list_for_version {
local _major=${_ver%%.*} local _major=${_ver%%.*}
local _return local _return
if [ "${PLAT}" = "arm64" ] || [ "${PLAT}" = "universal2" ]; then if [ "${PLAT}" = "arm64" ]; then
_return="11.0" _return="11.0"
elif [ "$_major" -eq "2" ]; then elif [ "$_major" -eq "2" ]; then
[ $(lex_ver $_ver) -lt $(lex_ver 2.7.18) ] && _return="10.6" [ $(lex_ver $_ver) -lt $(lex_ver 2.7.18) ] && _return="10.6"
...@@ -426,9 +426,8 @@ function activate_ccache { ...@@ -426,9 +426,8 @@ function activate_ccache {
function macos_intel_build_wrap { function macos_intel_build_wrap {
# Wrap build for single arch x86_64 wheels # Wrap build for single arch x86_64 wheels
local py_osx_ver=$(echo ${MB_PYTHON_OSX_VER:-$(macpython_sdk_for_version ${MB_PYTHON_VERSION})} | sed "s/\./_/g")
export PLAT="x86_64" export PLAT="x86_64"
export _PYTHON_HOST_PLATFORM="macosx-${py_osx_ver}-x86_64" export _PYTHON_HOST_PLATFORM="macosx-${MB_PYTHON_OSX_VER}-x86_64"
export CFLAGS+=" -arch x86_64" export CFLAGS+=" -arch x86_64"
export CXXFLAGS+=" -arch x86_64" export CXXFLAGS+=" -arch x86_64"
export ARCHFLAGS+=" -arch x86_64" export ARCHFLAGS+=" -arch x86_64"
...@@ -459,7 +458,7 @@ function macos_arm64_build_wrap { ...@@ -459,7 +458,7 @@ function macos_arm64_build_wrap {
function fuse_macos_intel_arm64 { function fuse_macos_intel_arm64 {
local wheelhouse=$(abspath ${WHEEL_SDIR:-wheelhouse}) local wheelhouse=$(abspath ${WHEEL_SDIR:-wheelhouse})
local py_osx_ver=$(echo ${MB_PYTHON_OSX_VER:-$(macpython_sdk_for_version ${MB_PYTHON_VERSION})} | sed "s/\./_/g") local py_osx_ver=$(echo ${MB_PYTHON_OSX_VER} | sed "s/\./_/g")
mkdir -p tmp_fused_wheelhouse mkdir -p tmp_fused_wheelhouse
for whl in $wheelhouse/*.whl; do for whl in $wheelhouse/*.whl; do
if [[ "$whl" == *macosx_${py_osx_ver}_x86_64.whl ]]; then if [[ "$whl" == *macosx_${py_osx_ver}_x86_64.whl ]]; then
......
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