From a9348d3676f3f0e46ea55264a2713e7431c00d6f Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 5 Feb 2004 04:12:28 +0000 Subject: GCC_REQD should be appended to, not set. --- mk/compiler/bsd.compiler.mk | 6 +++--- mk/compiler/gcc.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'mk') diff --git a/mk/compiler/bsd.compiler.mk b/mk/compiler/bsd.compiler.mk index e2570b47ace..4a7e6c311a0 100644 --- a/mk/compiler/bsd.compiler.mk +++ b/mk/compiler/bsd.compiler.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.compiler.mk,v 1.7 2004/02/05 03:35:20 jlam Exp $ +# $NetBSD: bsd.compiler.mk,v 1.8 2004/02/05 04:12:28 jlam Exp $ # # This Makefile fragment implements handling for supported C/C++/Fortran # compilers. @@ -82,10 +82,10 @@ USE_LANGUAGES?= c # after the pkgsrc-2004Q1 branch is cut. # . if defined(USE_GCC2) -GCC_REQD?= 2.8.0 +GCC_REQD+= 2.8.0 PKGSRC_COMPILER?= gcc . elif defined(USE_GCC3) -GCC_REQD?= 3.0 +GCC_REQD+= 3.0 PKGSRC_COMPILER?= gcc . elif defined(USE_PKGSRC_GCC) _USE_PKGSRC_GCC= yes diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk index aa1bd5aebd1..948cf73ac6b 100644 --- a/mk/compiler/gcc.mk +++ b/mk/compiler/gcc.mk @@ -1,9 +1,9 @@ -# $NetBSD: gcc.mk,v 1.36 2004/02/05 03:35:20 jlam Exp $ +# $NetBSD: gcc.mk,v 1.37 2004/02/05 04:12:28 jlam Exp $ .if !defined(COMPILER_GCC_MK) COMPILER_GCC_MK= one -GCC_REQD?= 2.8.0 +GCC_REQD+= 2.8.0 # _GCC_DIST_VERSION is the highest version of GCC installed by the pkgsrc # without the PKGREVISIONs. -- cgit v1.2.3