Skip to content

Commit

Permalink
Mk/Uses/fortran.mk: revert fa6fe3f
Browse files Browse the repository at this point in the history
For some reason, net/mpich does not accept FC with F90. It should be
possible to fix it, but I’m afraid that other ports could be affected
too, so it seems better to revert for the moment.

PR:		267502
Reported by:	jfc (at) mit.edu
  • Loading branch information
thierry-FreeBSD committed Nov 1, 2022
1 parent 8452483 commit 0e482f8
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions Mk/Uses/fortran.mk
Expand Up @@ -18,7 +18,6 @@ _GCC_VER= ${GCC_DEFAULT:S/.//}
BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
F77= gfortran${_GCC_VER}
F90= gfortran${_GCC_VER}
FC= gfortran${_GCC_VER}
FFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
FCFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
Expand All @@ -29,7 +28,7 @@ IGNORE= USES=fortran: invalid arguments: ${fortran_ARGS}
. endif

USE_BINUTILS= yes
CONFIGURE_ENV+= F77="${F77}" F90="${F90}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}"
MAKE_ENV+= F77="${F77}" F90="${F90}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}"
CONFIGURE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}"
MAKE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}"

.endif

0 comments on commit 0e482f8

Please sign in to comment.