cleanup and fix macos-x86_64

Author: mattip

tools/build_steps.sh

@@ -41,6 +41,7 @@ function before_build {
         source venv/bin/activate
         # Since install_fortran uses `uname -a` to determine arch,
         # force the architecture
+        unalias gfortran 2>/dev/null || true
         arch -${PLAT} bash -s << "        EOF"
             set -ex
             source tools/gfortran_utils.sh
@@ -159,14 +160,6 @@ function do_build_lib {
         Darwin-x86_64)
             local bitness=64
             local target="CORE2"
-            # Use gfortran-11
-            unalias gfortran
-            # Since install_fortran uses `uname -a` to determine arch,
-            # force the architecture
-            arch -${PLAT} bash -s << EOF
-source ${ROOT_DIR}/gfortran-install/gfortran_utils.sh
-install_gfortran
-EOF
             export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
             CFLAGS="$CFLAGS -arch x86_64"
             export SDKROOT=${SDKROOT:-$(xcrun --show-sdk-path)}