diff options
| author | asau <asau@pkgsrc.org> | 2013-06-15 21:50:43 +0000 |
|---|---|---|
| committer | asau <asau@pkgsrc.org> | 2013-06-15 21:50:43 +0000 |
| commit | f29f4042ff4762ed5e02fac32e0a40db75da8d7b (patch) | |
| tree | 95d451f3b356ab23374fa4dcf9ad67bafc30218a /mk/compiler | |
| parent | ff9a7af5284d2824728bea3466f2d810bd1bec63 (diff) | |
| download | pkgsrc-f29f4042ff4762ed5e02fac32e0a40db75da8d7b.tar.gz | |
Stop advertising "fortran" support by GCC before 4.4
("fortran" denotes post-Fortran-77 dialects).
Diffstat (limited to 'mk/compiler')
| -rw-r--r-- | mk/compiler/gcc.mk | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk index 069bbaccc7c..50e265bb07f 100644 --- a/mk/compiler/gcc.mk +++ b/mk/compiler/gcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: gcc.mk,v 1.138 2013/06/15 19:06:31 joerg Exp $ +# $NetBSD: gcc.mk,v 1.139 2013/06/15 21:50:43 asau Exp $ # # This is the compiler definition for the GNU Compiler Collection. # @@ -290,11 +290,11 @@ _NEED_GCC48= yes # Assume by default that GCC will only provide a C compiler. LANGUAGES.gcc?= c .if !empty(_NEED_GCC2:M[yY][eE][sS]) -LANGUAGES.gcc= c c++ fortran fortran77 objc +LANGUAGES.gcc= c c++ fortran77 objc .elif !empty(_NEED_GCC3:M[yY][eE][sS]) -LANGUAGES.gcc= c c++ fortran fortran77 java objc +LANGUAGES.gcc= c c++ fortran77 java objc .elif !empty(_NEED_GCC34:M[yY][eE][sS]) -LANGUAGES.gcc= c c++ fortran fortran77 objc +LANGUAGES.gcc= c c++ fortran77 objc .elif !empty(_NEED_GCC44:M[yY][eE][sS]) LANGUAGES.gcc= c c++ fortran fortran77 java objc .elif !empty(_NEED_GCC45:M[yY][eE][sS]) @@ -340,7 +340,6 @@ MAKEFLAGS+= _IGNORE_GCC=yes _GCC_PKGSRCDIR= ../../lang/gcc _GCC_DEPENDENCY= gcc>=${_GCC_REQD}:../../lang/gcc . if !empty(_LANGUAGES.gcc:Mc++) || \ - !empty(_LANGUAGES.gcc:Mfortran) || \ !empty(_LANGUAGES.gcc:Mfortran77) || \ !empty(_LANGUAGES.gcc:Mobjc) _USE_GCC_SHLIB?= yes @@ -372,7 +371,6 @@ MAKEFLAGS+= _IGNORE_GCC=yes _GCC_PKGSRCDIR= ../../lang/gcc34 _GCC_DEPENDENCY= gcc34>=${_GCC_REQD}:../../lang/gcc34 . if !empty(_LANGUAGES.gcc:Mc++) || \ - !empty(_LANGUAGES.gcc:Mfortran) || \ !empty(_LANGUAGES.gcc:Mfortran77) || \ !empty(_LANGUAGES.gcc:Mobjc) _USE_GCC_SHLIB?= yes @@ -514,7 +512,7 @@ _USE_GCC_SHLIB?= yes _IGNORE_GCC3F77= yes MAKEFLAGS+= _IGNORE_GCC3F77=yes . endif -. if !defined(_IGNORE_GCC3F77) && (!empty(_LANGUAGES.gcc:Mfortran) || !empty(_LANGUAGES.gcc:Mfortran77)) +. if !defined(_IGNORE_GCC3F77) && !empty(_LANGUAGES.gcc:Mfortran77) _GCC_PKGSRCDIR+= ../../lang/gcc3-f77 _GCC_DEPENDENCY+= gcc3-f77>=${_GCC_REQD}:../../lang/gcc3-f77 _USE_GCC_SHLIB?= yes |