From c42fccccb5c382139dde078bb0305be888d01ff1 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 2 Sep 2025 15:36:32 +0200 Subject: [PATCH 1/3] Drop installation of cmake --- .github/workflows/apple_m.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/apple_m.yml b/.github/workflows/apple_m.yml index 56d46cf0c..b6f13570c 100644 --- a/.github/workflows/apple_m.yml +++ b/.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" From a1331406a37cd8737afd15cc5de7498926b93ebb Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 2 Sep 2025 15:39:08 +0200 Subject: [PATCH 2/3] drop (re)installation of cmake on osx runners --- .github/workflows/dynamic_arch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dynamic_arch.yml b/.github/workflows/dynamic_arch.yml index 950ab08ea..131966fbb 100644 --- a/.github/workflows/dynamic_arch.yml +++ b/.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 From 1c7251ca20ff3c416831300ee22c30ed846ce302 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 2 Sep 2025 18:36:02 +0200 Subject: [PATCH 3/3] remove the -llto_library option for any osx fortran compiler --- Makefile.system | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile.system b/Makefile.system index 3f1c48d23..b44cbf987 100644 --- a/Makefile.system +++ b/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