Merge pull request #5491 from martin-frbg/fixup5485 #6161

Job	Run time
build (ubuntu-latest, gfortran, make)	22m 50s
build (ubuntu-latest, gfortran, cmake)	46m 42s
build (ubuntu-latest, flang, cmake)	11m 57s
msys2 (CLANG64, int32, Release)	20m 3s
build (macos-latest, gfortran, cmake)	19m 40s
neoverse_build	7m 58s
msys2 (UCRT64, int32, None, mingw-w64-ucrt-x86_64, fc)	14m 13s
build (ubuntu-latest, flang, make)	5m 8s
cross_build (mips64el, mips64el-linux-gnuabi64, DYNAMIC_ARCH=1 TARGET=GENERIC)	3m 43s
msys2 (UCRT64, int64, Release)	16m 21s
msys2 (CLANG64, int64, Release)	18m 14s
cross_build (alpha, alpha-linux-gnu, TARGET=EV4)	2m 49s
build (macos-latest, gfortran, make)	5m 32s
cross_build (riscv64, riscv64-linux-gnu, TARGET=RISCV64_GENERIC)	3m 14s
msys2 (MINGW32, int32, Release)	16m 3s
msys2 (UCRT64, int32, Release)	15m 34s
cross_build (mipsel, mipsel-linux-gnu, TARGET=MIPS1004K)	3m 30s
	3h 53m 31s

Provide feedback