Martin Kroeker
GitHub
1 month ago
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 4 deletions
Unified View
Diff Options
-
+1 -1.github/workflows/apple_m.yml
-
+1 -1.github/workflows/dynamic_arch.yml
-
+0 -2Makefile.system
+ 1
- 1
.github/workflows/apple_m.yml
View File
| @@ -44,7 +44,7 @@ jobs: | |||||
| elif [ "$RUNNER_OS" == "macOS" ]; then | elif [ "$RUNNER_OS" == "macOS" ]; then | ||||
| # It looks like "gfortran" isn't working correctly unless "gcc" is re-installed. | # It looks like "gfortran" isn't working correctly unless "gcc" is re-installed. | ||||
| brew reinstall gcc | brew reinstall gcc | ||||
| brew install coreutils cmake ccache | |||||
| brew install coreutils ccache | |||||
| brew install llvm | brew install llvm | ||||
| else | else | ||||
| echo "::error::$RUNNER_OS not supported" | echo "::error::$RUNNER_OS not supported" | ||||
+ 1
- 1
.github/workflows/dynamic_arch.yml
View File
| @@ -49,7 +49,7 @@ jobs: | |||||
| elif [ "$RUNNER_OS" == "macOS" ]; then | elif [ "$RUNNER_OS" == "macOS" ]; then | ||||
| # It looks like "gfortran" isn't working correctly unless "gcc" is re-installed. | # It looks like "gfortran" isn't working correctly unless "gcc" is re-installed. | ||||
| brew reinstall gcc | brew reinstall gcc | ||||
| brew install coreutils cmake ccache | |||||
| brew install coreutils ccache | |||||
| else | else | ||||
| echo "::error::$RUNNER_OS not supported" | echo "::error::$RUNNER_OS not supported" | ||||
| exit 1 | exit 1 | ||||
+ 0
- 2
Makefile.system
View File
| @@ -442,11 +442,9 @@ CCOMMON_OPT += -Wl,-ld_classic | |||||
| FCOMMON_OPT += -Wl,-ld_classic | FCOMMON_OPT += -Wl,-ld_classic | ||||
| endif | endif | ||||
| ifeq (x$(XCVER), x 16) | ifeq (x$(XCVER), x 16) | ||||
| ifeq ($(F_COMPILER), GFORTRAN) | |||||
| override CEXTRALIB := $(filter-out(-lto_library, $(CEXTRALIB))) | override CEXTRALIB := $(filter-out(-lto_library, $(CEXTRALIB))) | ||||
| endif | endif | ||||
| endif | endif | ||||
| endif | |||||
| ifneq (,$(findstring $(OSNAME), FreeBSD OpenBSD DragonFly)) | ifneq (,$(findstring $(OSNAME), FreeBSD OpenBSD DragonFly)) | ||||
| MD5SUM = md5 -r | MD5SUM = md5 -r | ||||