Merge pull request #5436 from martin-frbg/update_osx_ci

Update Mac CI jobs as cmake is preinstalled in the runner images now

Author: martin-frbg

.github/workflows/apple_m.yml

@@ -44,7 +44,7 @@ jobs:
           elif [ "$RUNNER_OS" == "macOS" ]; then
             # It looks like "gfortran" isn't working correctly unless "gcc" is re-installed.
             brew reinstall gcc
-            brew install coreutils cmake ccache
+            brew install coreutils ccache
             brew install llvm
           else
             echo "::error::$RUNNER_OS not supported"

.github/workflows/dynamic_arch.yml

@@ -49,7 +49,7 @@ jobs:
           elif [ "$RUNNER_OS" == "macOS" ]; then
             # It looks like "gfortran" isn't working correctly unless "gcc" is re-installed.
             brew reinstall gcc
-            brew install coreutils cmake ccache
+            brew install coreutils ccache
           else
             echo "::error::$RUNNER_OS not supported"
             exit 1

Makefile.system

@@ -442,11 +442,9 @@ CCOMMON_OPT += -Wl,-ld_classic
 FCOMMON_OPT += -Wl,-ld_classic
 endif
 ifeq (x$(XCVER), x 16)
-ifeq ($(F_COMPILER), GFORTRAN)
 override CEXTRALIB := $(filter-out(-lto_library, $(CEXTRALIB))) 
 endif
 endif
-endif
 
 ifneq (,$(findstring $(OSNAME), FreeBSD OpenBSD DragonFly))
 MD5SUM = md5 -r