diff options
| author | nia <nia@pkgsrc.org> | 2020-03-30 09:39:24 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-03-30 09:39:24 +0000 |
| commit | db8643840e33fcfc964bac0780a4f4695af4b106 (patch) | |
| tree | 0a0153d9c0028eade81031b0bebb32d775b58df3 | |
| parent | 5863facdf4e6fa12ea4c37d89a595f88f5993646 (diff) | |
| download | pkgsrc-db8643840e33fcfc964bac0780a4f4695af4b106.tar.gz | |
mk/compiler: Make gfortran the default fortran compiler.
Discussed on tech-pkg@ before freeze.
| -rw-r--r-- | mk/compiler/clang.mk | 6 | ||||
| -rw-r--r-- | mk/compiler/gcc.mk | 9 |
2 files changed, 2 insertions, 13 deletions
diff --git a/mk/compiler/clang.mk b/mk/compiler/clang.mk index a2b773679c7..92e904ab1f1 100644 --- a/mk/compiler/clang.mk +++ b/mk/compiler/clang.mk @@ -1,4 +1,4 @@ -# $NetBSD: clang.mk,v 1.22 2020/03/14 10:00:37 nia Exp $ +# $NetBSD: clang.mk,v 1.23 2020/03/30 09:39:24 nia Exp $ # # This is the compiler definition for the clang compiler. # @@ -84,11 +84,7 @@ _LANGUAGES.clang= # empty _LANGUAGES.clang+= ${LANGUAGES.clang:M${_lang_}} .endfor -.if !empty(MACHINE_ARCH:Maarch64*) PKGSRC_FORTRAN?=gfortran -.else -PKGSRC_FORTRAN?=g95 -.endif .if !empty(PKGSRC_FORTRAN) && (!empty(USE_LANGUAGES:Mfortran) || !empty(USE_LANGUAGES:Mfortran77)) . include "../../mk/compiler/${PKGSRC_FORTRAN}.mk" diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk index 6454e83cb76..72bfb064cbd 100644 --- a/mk/compiler/gcc.mk +++ b/mk/compiler/gcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: gcc.mk,v 1.209 2020/03/14 10:00:37 nia Exp $ +# $NetBSD: gcc.mk,v 1.210 2020/03/30 09:39:24 nia Exp $ # # This is the compiler definition for the GNU Compiler Collection. # @@ -1046,14 +1046,7 @@ ${_GCC_${_var_}}: .endfor # On systems without a Fortran compiler, pull one in if needed. -# The default is g95 as it supports a modern dialect, but it can -# be overridden in mk.conf to use only f2c. -# -.if !empty(MACHINE_ARCH:Maarch64*) PKGSRC_FORTRAN?=gfortran -.else -PKGSRC_FORTRAN?=g95 -.endif _GCC_NEEDS_A_FORTRAN= no .if empty(_USE_PKGSRC_GCC:M[yY][eE][sS]) && !exists(${FCPATH}) |