add DYLD_LIBRARY_PATH for arm64, specify python3.11 arch type

Author: mattip

tools/build_steps.sh

@@ -9,12 +9,16 @@ MB_PYTHON_VERSION=3.9
 function before_build {
     # Manylinux Python version set in build_lib
     if [ -n "$IS_OSX" ]; then
-        sudo mkdir -p /usr/local/lib
-        sudo chmod 777 /usr/local/lib
-        touch /usr/local/lib/.dir_exists
-        sudo mkdir -p /usr/local/include
-        sudo chmod 777 /usr/local/include
-        touch /usr/local/include/.dir_exists
+        if [ ! -e /usr/local/lib ]; then
+            sudo mkdir -p /usr/local/lib
+            sudo chmod 777 /usr/local/lib
+            touch /usr/local/lib/.dir_exists
+        fi
+        if [ ! -e /usr/local/include ]; then
+            sudo mkdir -p /usr/local/include
+            sudo chmod 777 /usr/local/include
+            touch /usr/local/include/.dir_exists
+        fi
         source ${ROOT_DIR}/multibuild/osx_utils.sh
         get_macpython_environment ${MB_PYTHON_VERSION} venv
         # Since install_fortran uses `uname -a` to determine arch,
@@ -179,6 +183,7 @@ function do_build_lib {
             CFLAGS="$CFLAGS -ftrapping-math -mmacos-version-min=11.0"
             MACOSX_DEPLOYMENT_TARGET="11.0"
             export SDKROOT=${SDKROOT:-$(xcrun --show-sdk-path)}
+            export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
             ;;
         *-s390x)
             local bitness=64

tools/build_wheel.sh

@@ -101,10 +101,15 @@ if [ "${PLAT}" == "arm64" ]; then
     exit 0
 fi
 # Test that the wheel works with a different python
+PYTHON=python3.11
+if [ $(uname) == "Darwin" ] -a [ "${PLAT}" == "x86_64" ]; then
+    which python3.11
+    PYTHON="arch -x86_64 python3.11"
+fi
 if [ "${INTERFACE64}" != "1" ]; then
-  python3.11 -m pip install --no-index --find-links dist scipy_openblas32
-  python3.11 -m scipy_openblas32
+  $PYTHON -m pip install --no-index --find-links dist scipy_openblas32
+  $PYTHON -m scipy_openblas32
 else
-  python3.11 -m pip install --no-index --find-links dist scipy_openblas64
-  python3.11 -m scipy_openblas64
+  $PYTHON -m pip install --no-index --find-links dist scipy_openblas64
+  $PYTHON -m scipy_openblas64
 fi

tools/local_build.sh

@@ -4,7 +4,10 @@
 set -e
 
 # Set extra env
-if [[ $(uname -m) == "x86_64" ]]; then
+if [[ $(uname) == "Darwin" ]]; then
+    # Force x86_64
+    export PLAT=x86_64
+elif [[ $(uname -m) == "x86_64" ]]; then
     echo got x86_64
     export TRAVIS_OS_NAME=ubuntu-latest
     export PLAT=x86_64
@@ -64,11 +67,6 @@ function build_openblas {
     fi
     # Build OpenBLAS
     set -xeo pipefail
-    if [ "$PLAT" == "arm64" ]; then
-      sudo xcode-select -switch /Applications/Xcode_12.5.1.app
-      export SDKROOT=/Applications/Xcode_12.5.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk
-      clang --version
-    fi
     source tools/build_steps.sh
     echo "------ BEFORE BUILD ---------"
     before_build