diff options
| author | nia <nia@pkgsrc.org> | 2021-04-02 16:54:48 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2021-04-02 16:54:48 +0000 |
| commit | fa48074acd6e3590da62e6dc9e8ac238d1e05494 (patch) | |
| tree | c1c6c627f51c2d3c98734e4f16481214391e85f8 /mk/compiler | |
| parent | 1e3b321b4372f8670f4314ed0e2d1675ee72c341 (diff) | |
| download | pkgsrc-fa48074acd6e3590da62e6dc9e8ac238d1e05494.tar.gz | |
mk: use gcc6-aux for ada
Diffstat (limited to 'mk/compiler')
| -rw-r--r-- | mk/compiler/gcc.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk index 9a3c57d1ad9..0a24ff19eab 100644 --- a/mk/compiler/gcc.mk +++ b/mk/compiler/gcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: gcc.mk,v 1.221 2021/04/02 11:48:16 nia Exp $ +# $NetBSD: gcc.mk,v 1.222 2021/04/02 16:54:48 nia Exp $ # # This is the compiler definition for the GNU Compiler Collection. # @@ -144,10 +144,10 @@ GCC_REQD+= 2.8.0 GCC_REQD+= 3.0 .endif -# Only one compiler defined here supports Ada: lang/gcc5-aux -# If the Ada language is requested, force lang/gcc5-aux to be selected +# Only one compiler defined here supports Ada: lang/gcc6-aux +# If the Ada language is requested, force lang/gcc6-aux to be selected .if !empty(USE_LANGUAGES:Mada) -GCC_REQD+= 20120614 +GCC_REQD+= 20160822 .endif # _GCC_DIST_VERSION is the highest version of GCC installed by the pkgsrc @@ -636,16 +636,16 @@ _USE_GCC_SHLIB?= yes . endif .elif !empty(_NEED_GCC_AUX:M[yY][eE][sS]) # -# We require Ada-capable compiler in the lang/gcc5-aux directory. +# We require Ada-capable compiler in the lang/gcc6-aux directory. # -_GCC_PKGBASE= gcc5-aux -. if ${PKGPATH} == lang/gcc5-aux +_GCC_PKGBASE= gcc6-aux +. if ${PKGPATH} == lang/gcc6-aux _IGNORE_GCC= yes MAKEFLAGS+= _IGNORE_GCC=yes . endif . if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc) -_GCC_PKGSRCDIR= ../../lang/gcc5-aux -_GCC_DEPENDENCY= gcc5-aux>=${_GCC_REQD}:../../lang/gcc5-aux +_GCC_PKGSRCDIR= ../../lang/gcc6-aux +_GCC_DEPENDENCY= gcc6-aux>=${_GCC_REQD}:../../lang/gcc6-aux . if !empty(_LANGUAGES.gcc:Mc++) || \ !empty(_LANGUAGES.gcc:Mfortran) || \ !empty(_LANGUAGES.gcc:Mfortran77) || \ |