CVS commit: pkgsrc/mk/compiler

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Nov 23 15:44:11 UTC 2022

Modified Files:
        pkgsrc/mk/compiler: gcc.mk

Log Message:
mk: Only add obsolete GCC_REQD if required.

Each GCC_REQD entry has an associated cost as it invokes pkg_admin to see
if it's suitable, so only add 2.8.0 and 3.0 when absolutely necessary.


To generate a diff of this commit:
cvs rdiff -u -r1.246 -r1.247 pkgsrc/mk/compiler/gcc.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.246 pkgsrc/mk/compiler/gcc.mk:1.247
--- pkgsrc/mk/compiler/gcc.mk:1.246     Mon Aug  1 07:58:21 2022
+++ pkgsrc/mk/compiler/gcc.mk   Wed Nov 23 15:44:11 2022
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.246 2022/08/01 07:58:21 wiz Exp $
+# $NetBSD: gcc.mk,v 1.247 2022/11/23 15:44:11 jperkin Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -137,11 +137,17 @@ USE_NATIVE_GCC?=  no
 USE_PKGSRC_GCC?=       no
 USE_PKGSRC_GCC_RUNTIME?=no
 
-GCC_REQD+=     2.8.0
-
-# gcc2 doesn't support c99 and amd64
-.if !empty(USE_LANGUAGES:Mc99) || ${MACHINE_ARCH} == "x86_64"
+#
+# Each successive GCC_REQD has an associated cost below when executing
+# pkg_admin to determine if it's suitable, so only add these incredibly
+# old versions if we haven't already set one.
+#
+.if !defined(GCC_REQD)
+.  if !empty(USE_LANGUAGES:Mc99) || ${MACHINE_ARCH} == "x86_64"
 GCC_REQD+=     3.0
+.  else
+GCC_REQD+=     2.8.0
+.  endif
 .endif
 
 # Only one compiler defined here supports Ada: lang/gcc6-aux