summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-02-05 04:12:28 +0000
committerjlam <jlam@pkgsrc.org>2004-02-05 04:12:28 +0000
commit5add53c2b4dc4effa0f9feb0a611d9c7e1352bb6 (patch)
tree9717c0f7e7ebe8682c451756d0dc4e49746b68e2
parent6472620f7b8067224e5d6328b2518224f0fba0a4 (diff)
downloadpkgsrc-5add53c2b4dc4effa0f9feb0a611d9c7e1352bb6.tar.gz
GCC_REQD should be appended to, not set.
-rw-r--r--mk/compiler/bsd.compiler.mk6
-rw-r--r--mk/compiler/gcc.mk4
2 files changed, 5 insertions, 5 deletions
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.