diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-05 04:12:28 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-05 04:12:28 +0000 |
| commit | a9348d3676f3f0e46ea55264a2713e7431c00d6f (patch) | |
| tree | 9717c0f7e7ebe8682c451756d0dc4e49746b68e2 | |
| parent | 2a69e604f0733b38dbed0cd2f0c84040007d4474 (diff) | |
| download | pkgsrc-a9348d3676f3f0e46ea55264a2713e7431c00d6f.tar.gz | |
GCC_REQD should be appended to, not set.
| -rw-r--r-- | mk/compiler/bsd.compiler.mk | 6 | ||||
| -rw-r--r-- | mk/compiler/gcc.mk | 4 |
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. |