Sat Dec 5 09:24:00 2020 UTC ()
mk: fix a duplicate GCC9 variable to refer to GCC10 instead

Noted by Jackson Bryn in PR 55842.


(wiz)
diff -r1.216 -r1.217 pkgsrc/mk/compiler/gcc.mk
cvs diff -r1.216 -r1.217 pkgsrc/mk/compiler/gcc.mk (expand / switch to unified diff)

--- pkgsrc/mk/compiler/gcc.mk 2020/10/28 13:19:25 1.216
+++ pkgsrc/mk/compiler/gcc.mk 2020/12/05 09:24:00 1.217
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: gcc.mk,v 1.216 2020/10/28 13:19:25 wiz Exp $ 1# $NetBSD: gcc.mk,v 1.217 2020/12/05 09:24:00 wiz Exp $
2# 2#
3# This is the compiler definition for the GNU Compiler Collection. 3# This is the compiler definition for the GNU Compiler Collection.
4# 4#
5# User-settable variables: 5# User-settable variables:
6# 6#
7# GCCBASE 7# GCCBASE
8# If using a native GCC and the compiler is not in $PATH then 8# If using a native GCC and the compiler is not in $PATH then
9# this should be set to the base installation directory. 9# this should be set to the base installation directory.
10# 10#
11# USE_NATIVE_GCC 11# USE_NATIVE_GCC
12# When set to "yes", the native gcc is used, no matter which 12# When set to "yes", the native gcc is used, no matter which
13# compiler version a package requires. 13# compiler version a package requires.
14# 14#
@@ -86,27 +86,27 @@ _DEF_VARS.gcc= \ @@ -86,27 +86,27 @@ _DEF_VARS.gcc= \
86 _GCC_DIST_NAME _GCC_DIST_VERSION \ 86 _GCC_DIST_NAME _GCC_DIST_VERSION \
87 _GCC_FC _GCC_LDFLAGS _GCC_LIBDIRS _GCC_PKG \ 87 _GCC_FC _GCC_LDFLAGS _GCC_LIBDIRS _GCC_PKG \
88 _GCC_PKGBASE _GCC_PKGSRCDIR _GCC_PKG_SATISFIES_DEP \ 88 _GCC_PKGBASE _GCC_PKGSRCDIR _GCC_PKG_SATISFIES_DEP \
89 _GCC_PREFIX _GCC_REQD _GCC_STRICTEST_REQD _GCC_SUBPREFIX \ 89 _GCC_PREFIX _GCC_REQD _GCC_STRICTEST_REQD _GCC_SUBPREFIX \
90 _GCC_TEST_DEPENDS _GCC_NEEDS_A_FORTRAN _GCC_VARS _GCC_VERSION \ 90 _GCC_TEST_DEPENDS _GCC_NEEDS_A_FORTRAN _GCC_VARS _GCC_VERSION \
91 _GCC_VERSION_STRING \ 91 _GCC_VERSION_STRING \
92 _GCC_ADA _GCC_GMK _GCC_GLK _GCC_GBD _GCC_CHP _GCC_GLS _GCC_GNT _GCC_PRP \ 92 _GCC_ADA _GCC_GMK _GCC_GLK _GCC_GBD _GCC_CHP _GCC_GLS _GCC_GNT _GCC_PRP \
93 _IGNORE_GCC _IGNORE_GCC3CXX _IGNORE_GCC3F77 _IGNORE_GCC3OBJC \ 93 _IGNORE_GCC _IGNORE_GCC3CXX _IGNORE_GCC3F77 _IGNORE_GCC3OBJC \
94 _IS_BUILTIN_GCC \ 94 _IS_BUILTIN_GCC \
95 _LANGUAGES.gcc \ 95 _LANGUAGES.gcc \
96 _LINKER_RPATH_FLAG \ 96 _LINKER_RPATH_FLAG \
97 _NEED_GCC2 _NEED_GCC3 _NEED_GCC34 _NEED_GCC44 \ 97 _NEED_GCC2 _NEED_GCC3 _NEED_GCC34 _NEED_GCC44 \
98 _NEED_GCC48 _NEED_GCC49 _NEED_GCC5 _NEED_GCC6 \ 98 _NEED_GCC48 _NEED_GCC49 _NEED_GCC5 _NEED_GCC6 \
99 _NEED_GCC7 _NEED_GCC8 _NEED_GCC9 _NEED_GCC9 \ 99 _NEED_GCC7 _NEED_GCC8 _NEED_GCC9 _NEED_GCC10 \
100 _NEED_GCC_AUX _NEED_NEWER_GCC \ 100 _NEED_GCC_AUX _NEED_NEWER_GCC \
101 _PKGSRC_GCC_VERSION \ 101 _PKGSRC_GCC_VERSION \
102 _USE_GCC_SHLIB _USE_PKGSRC_GCC \ 102 _USE_GCC_SHLIB _USE_PKGSRC_GCC \
103 _WRAP_EXTRA_ARGS.CC \ 103 _WRAP_EXTRA_ARGS.CC \
104 _EXTRA_CC_DIRS \ 104 _EXTRA_CC_DIRS \
105 _CXX_STD_VERSIONS \ 105 _CXX_STD_VERSIONS \
106 ${_CXX_STD_VERSIONS:@std@_CXX_STD_FLAG.${std}@} \ 106 ${_CXX_STD_VERSIONS:@std@_CXX_STD_FLAG.${std}@} \
107 _MKPIE_CFLAGS.gcc _MKPIE_LDFLAGS.gcc \ 107 _MKPIE_CFLAGS.gcc _MKPIE_LDFLAGS.gcc \
108 _FORTIFY_CFLAGS _RELRO_LDFLAGS _STACK_CHECK_CFLAGS \ 108 _FORTIFY_CFLAGS _RELRO_LDFLAGS _STACK_CHECK_CFLAGS \
109 _CTF_CFLAGS \ 109 _CTF_CFLAGS \
110 _GCC_DIR \ 110 _GCC_DIR \
111 _ALIASES.CC _ALIASES.CPP _ALIASES.CXX _ALIASES.FC \ 111 _ALIASES.CC _ALIASES.CPP _ALIASES.CXX _ALIASES.FC \
112 _ALIASES.ADA _ALIASES.GMK _ALIASES.GLK _ALIASES.GBD \ 112 _ALIASES.ADA _ALIASES.GMK _ALIASES.GLK _ALIASES.GBD \