Fix MacOS Clang builds.

ohearnk · Feb 21, 2025 · 98ee6a4 · 98ee6a4
1 parent 7667f21
commit 98ee6a4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/build_test_mpi.yml b/.github/workflows/build_test_mpi.yml
@@ -214,7 +214,7 @@ jobs:
             compiler-version: '15'
             c-compiler: 'clang'
             cxx-compiler: 'clang++'
-            fortran-compiler: 'gfortran-14'
+            fortran-compiler: 'gfortran'
             compiler-install: 'llvm@15 gcc@14'
           - os: 'macos-14'
             compiler-type: 'GNU'
@@ -228,7 +228,7 @@ jobs:
             compiler-version: '15'
             c-compiler: 'clang'
             cxx-compiler: 'clang++'
-            fortran-compiler: 'gfortran-14'
+            fortran-compiler: 'gfortran'
             compiler-install: 'llvm@15 gcc@14'
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} - MPI - CMake - ${{ matrix.compiler-type }} - ${{ matrix.compiler-version }}
@@ -292,6 +292,9 @@ jobs:
             if [[ ${{ matrix.compiler-type }} == 'GNU' ]]; then
               sudo ln -Fs $BREW_COMPILER_PREFIX/${{ matrix.fortran-compiler }}-${{ matrix.compiler-version }} \
                 $BREW_COMPILER_PREFIX/${{ matrix.fortran-compiler }}
+            elif [[ ${{ matrix.compiler-type }} == 'CLANG' ]]; then
+              sudo ln -Fs $BREW_COMPILER_PREFIX/${{ matrix.fortran-compiler }}-14 \
+                $BREW_COMPILER_PREFIX/${{ matrix.fortran-compiler }}
             fi
           fi
       - name: 'Linux: Log Softare Environment Configuration'

diff --git a/.github/workflows/build_test_serial.yml b/.github/workflows/build_test_serial.yml
@@ -208,7 +208,7 @@ jobs:
             compiler-version: '15'
             c-compiler: 'clang'
             cxx-compiler: 'clang++'
-            fortran-compiler: 'gfortran-14'
+            fortran-compiler: 'gfortran'
             compiler-install: 'llvm@15 gcc@14'
           - os: 'macos-14'
             compiler-type: 'GNU'
@@ -222,7 +222,7 @@ jobs:
             compiler-version: '15'
             c-compiler: 'clang'
             cxx-compiler: 'clang++'
-            fortran-compiler: 'gfortran-14'
+            fortran-compiler: 'gfortran'
             compiler-install: 'llvm@15 gcc@14'
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} - Serial - CMake - ${{ matrix.compiler-type }} - ${{ matrix.compiler-version }}
@@ -280,6 +280,9 @@ jobs:
             if [[ ${{ matrix.compiler-type }} == 'GNU' ]]; then
               sudo ln -Fs $BREW_COMPILER_PREFIX/${{ matrix.fortran-compiler }}-${{ matrix.compiler-version }} \
                 $BREW_COMPILER_PREFIX/${{ matrix.fortran-compiler }}
+            elif [[ ${{ matrix.compiler-type }} == 'CLANG' ]]; then
+              sudo ln -Fs $BREW_COMPILER_PREFIX/${{ matrix.fortran-compiler }}-14 \
+                $BREW_COMPILER_PREFIX/${{ matrix.fortran-compiler }}
             fi
           fi
       - name: 'Linux: Log Softare Environment Configuration'