do not run install_gfortran in a shell, export FC and FFLAGS

Author: mattip

tools/build_steps.sh

@@ -39,16 +39,15 @@ function before_build {
         # get_macpython_environment ${MB_PYTHON_VERSION} venv
         python3.9 -m venv venv
         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
-            install_gfortran
-        EOF
-        which gfortran
-        gfortran --version
+        source tools/gfortran_utils.sh
+        download_and_unpack_gfortran ${PLAT} native
+        export FC=/opt/gfortran/gfortran-darwin-${PLAT}-native/bin/gfortran
+        which ${FC}
+        ${FC} --version
+        local libdir=/opt/gfortran/gfortran-darwin-${PLAT}-native/lib
+        export FFLAGS="-L${libdir} -Wl,-rpath,${libdir}"
 
         # Deployment target set by gfortran_utils
         echo "Deployment target $MACOSX_DEPLOYMENT_TARGET"

tools/gfortran_utils.sh

@@ -131,19 +131,14 @@ if [ "$(uname)" == "Darwin" ]; then
             echo "shasum mismatch for gfortran-darwin-${arch}-${type}"
             exit 1
         fi
-        sudo mkdir -p /opt/
-        sudo cp "gfortran-darwin-${arch}-${type}.tar.gz" /opt/gfortran-darwin-${arch}-${type}.tar.gz
-        pushd /opt
-            sudo tar -xvf gfortran-darwin-${arch}-${type}.tar.gz
-            sudo rm gfortran-darwin-${arch}-${type}.tar.gz
+        if [! -d /opt/gfortran ]; then
+            sudo mkdir -p /opt/gfortran
+            sudo chmod 777 /opt/gfortran
+        cp "gfortran-darwin-${arch}-${type}.tar.gz" /opt/goftran/gfortran-darwin-${arch}-${type}.tar.gz
+        pushd /opt/gfortran
+            tar -xvf gfortran-darwin-${arch}-${type}.tar.gz
+            rm gfortran-darwin-${arch}-${type}.tar.gz
         popd
-	if [[ "${type}" == "native" ]]; then
-	    # Link these into /usr/local so that there's no need to add rpath or -L
-	    for f in libgfortran.dylib libgfortran.5.dylib libgcc_s.1.dylib libgcc_s.1.1.dylib libquadmath.dylib libquadmath.0.dylib; do
-                ln -sf /opt/gfortran-darwin-${arch}-${type}/lib/$f /usr/local/lib/$f
-            done
-	    # Add it to PATH
-	    ln -sf /opt/gfortran-darwin-${arch}-${type}/bin/gfortran /usr/local/bin/gfortran
 	fi
     }
 
@@ -161,7 +156,7 @@ if [ "$(uname)" == "Darwin" ]; then
     function install_gfortran {
         download_and_unpack_gfortran $(uname -m) native
         check_gfortran
-        if [[ "${PLAT:-}" == "universal2" || "${PLAT:-}" == "arm64" ]]; then
+        if [[ "${PLAT:-}" == "universal2"]]; then
             install_arm64_cross_gfortran
         fi
     }