@@ -39,12 +39,13 @@ function before_build {
3939 # get_macpython_environment ${MB_PYTHON_VERSION} venv
4040 python3.9 -m venv venv
4141 source venv/bin/activate
42+ # Since install_fortran uses `uname -a` to determine arch,
43+ # force the architecture
44+ arch -${PLAT} bash -s << EOF
45+ source ${ROOT_DIR} /gfortran-install/gfortran_utils.sh
46+ install_gfortran
47+ EOF
4248
43- # Link to gfortran, see https://github.com/actions/runner-images/issues/3371
44- GCC_V=15
45- sudo ln -fs /opt/homebrew/bin/gfortran-${GCC_V} /usr/local/bin/gfortran
46- sudo mkdir -p /usr/local/gfortran
47- sudo ln -sf /opt/homebrew/Cellar/gcc@${GCC_V} /* /lib/gcc/${GCC_V} /usr/local/gfortran/lib
4849 echo GFORTRAN
4950 which gfortran
5051 gfortran --version
@@ -67,7 +68,7 @@ function clean_code {
6768 echo after git fetch origin
6869 git checkout $build_commit
6970 echo after git checkout $build_commit
70- git clean -fxd
71+ git clean -fxd
7172 echo after git clean
7273 git submodule update --init --recursive
7374 echo after git submodule update
@@ -221,14 +222,14 @@ function do_build_lib {
221222 fi
222223 if [ -n " $dynamic_list " ]; then
223224 CFLAGS=" $CFLAGS -fvisibility=protected -Wno-uninitialized" \
224- make BUFFERSIZE=20 DYNAMIC_ARCH=1 QUIET_MAKE=0 \
225+ make BUFFERSIZE=20 DYNAMIC_ARCH=1 QUIET_MAKE=1 \
225226 USE_OPENMP=0 NUM_THREADS=64 \
226227 DYNAMIC_LIST=" $dynamic_list " \
227228 BINARY=" $bitness " $interface_flags \
228229 TARGET=" $target "
229230 else
230231 CFLAGS=" $CFLAGS -fvisibility=protected -Wno-uninitialized" \
231- make BUFFERSIZE=20 DYNAMIC_ARCH=1 QUIET_MAKE=0 \
232+ make BUFFERSIZE=20 DYNAMIC_ARCH=1 QUIET_MAKE=1 \
232233 USE_OPENMP=0 NUM_THREADS=64 \
233234 BINARY=" $bitness " $interface_flags \
234235 TARGET=" $target "
0 commit comments