summaryrefslogtreecommitdiff
path: root/mk/compiler
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2013-06-15 19:06:31 +0000
committerjoerg <joerg@pkgsrc.org>2013-06-15 19:06:31 +0000
commit9c14077b42817f55e8c55a9083c03f88ef521f9a (patch)
treea5e06cc4e41e61fb9f7007f3eff49a5b6779c27a /mk/compiler
parent1ebb318b608d36237e62509f7f7816c164ac94c8 (diff)
downloadpkgsrc-9c14077b42817f55e8c55a9083c03f88ef521f9a.tar.gz
Do not switch Fortran compiler depending on the language requirement of
the package. For f2c, all Fortran 95+ programs are broken and it is generally not possible to mix output from different Fortran compilers. Default to g95 for now as fallback compiler.
Diffstat (limited to 'mk/compiler')
-rw-r--r--mk/compiler/gcc.mk12
1 files changed, 4 insertions, 8 deletions
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk
index 1e7b8faaabf..069bbaccc7c 100644
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.137 2013/06/13 10:45:46 jperkin Exp $
+# $NetBSD: gcc.mk,v 1.138 2013/06/15 19:06:31 joerg Exp $
#
# This is the compiler definition for the GNU Compiler Collection.
#
@@ -830,15 +830,11 @@ ${_GCC_${_var_}}:
. endif
.endfor
-# On older NetBSD systems and where the Fortran compiler doesn't exist,
-# force the use of f2c-f77 or some other fortran.
+# 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 overriden in mk.conf to use only f2c.
#
-.if !empty(USE_LANGUAGES:Mfortran)
PKGSRC_FORTRAN?=g95
-.endif
-#.if !empty(USE_LANGUAGES:Mfortran77)
-PKGSRC_FORTRAN?=f2c
-#.endif
_GCC_NEEDS_A_FORTRAN= no
.if empty(_USE_PKGSRC_GCC:M[yY][eE][sS]) && !exists(${FCPATH})