Commit b5f8b853 authored by Isuru Fernando's avatar Isuru Fernando
Browse files

update flags

parent a42c4421
...@@ -21,8 +21,12 @@ if [ -n "$IS_MACOS" ]; then ...@@ -21,8 +21,12 @@ if [ -n "$IS_MACOS" ]; then
ARCH_FLAGS=${ARCH_FLAGS:-"-arch i386 -arch x86_64"} ARCH_FLAGS=${ARCH_FLAGS:-"-arch i386 -arch x86_64"}
elif [[ $PLAT == x86_64 ]]; then elif [[ $PLAT == x86_64 ]]; then
ARCH_FLAGS=${ARCH_FLAGS:-"-arch x86_64"} ARCH_FLAGS=${ARCH_FLAGS:-"-arch x86_64"}
elif [[ $PLAT == arm64 ]]; then
ARCH_FLAGS=${ARCH_FLAGS:-"-arch arm64"}
elif [[ $PLAT == universal2 ]]; then
# Do nothing as we are going with fusing wheels
else else
echo "invalid platform = '$PLAT', supported values are 'intel' or 'x86_64'" echo "invalid platform = '$PLAT', supported values are 'intel' or 'x86_64' or 'arm64' or 'universal2'"
exit 1 exit 1
fi fi
# Only set CFLAGS, FFLAGS if they are not already defined. Build functions # Only set CFLAGS, FFLAGS if they are not already defined. Build functions
......
...@@ -174,7 +174,7 @@ function get_macpython_arch { ...@@ -174,7 +174,7 @@ function get_macpython_arch {
# Note: MUST only be called after the version of Python used to build the # Note: MUST only be called after the version of Python used to build the
# target wheel has been installed and is on the path # target wheel has been installed and is on the path
local distutils_plat=${1:-$(get_distutils_platform)} local distutils_plat=${1:-$(get_distutils_platform)}
if [[ $distutils_plat =~ macosx-(10\.[0-9]+)-(.*) ]]; then if [[ $distutils_plat =~ macosx-(1[0-9]\.[0-9]+)-(.*) ]]; then
echo ${BASH_REMATCH[2]} echo ${BASH_REMATCH[2]}
else else
echo "Error parsing macOS distutils platform '$distutils_plat'" echo "Error parsing macOS distutils platform '$distutils_plat'"
...@@ -192,7 +192,7 @@ function get_macpython_osx_ver { ...@@ -192,7 +192,7 @@ function get_macpython_osx_ver {
# Note: MUST only be called after the version of Python used to build the # Note: MUST only be called after the version of Python used to build the
# target wheel has been installed and is on the path # target wheel has been installed and is on the path
local distutils_plat=${1:-$(get_distutils_platform)} local distutils_plat=${1:-$(get_distutils_platform)}
if [[ $distutils_plat =~ macosx-(10\.[0-9]+)-(.*) ]]; then if [[ $distutils_plat =~ macosx-(1[0-9]\.[0-9]+)-(.*) ]]; then
echo ${BASH_REMATCH[1]} echo ${BASH_REMATCH[1]}
else else
echo "Error parsing macOS distutils platform '$distutils_plat'" echo "Error parsing macOS distutils platform '$distutils_plat'"
......
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