summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-02-20 07:10:06 +0000
committerjlam <jlam@pkgsrc.org>2004-02-20 07:10:06 +0000
commit75bd3d729aa885fe3c4096a8fd6a0a5f2d562ae3 (patch)
tree5d81f1442d363f726a5a4db1a54c1374e7c367a9
parent0316e476058865a3119f5ee38118afda26ae9eaa (diff)
downloadpkgsrc-75bd3d729aa885fe3c4096a8fd6a0a5f2d562ae3.tar.gz
If for some reason, _GCC_REQD doesn't match any of the version pattern
lists, then just assume that we need gcc3. The rest of the code in the file assumes that we either need gcc2 or gcc3, so this provides a fall-through, default value.
-rw-r--r--mk/compiler/gcc.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk
index d9a7bd11b7e..3efa0645c0d 100644
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.53 2004/02/18 13:32:38 jlam Exp $
+# $NetBSD: gcc.mk,v 1.54 2004/02/20 07:10:06 jlam Exp $
.if !defined(COMPILER_GCC_MK)
COMPILER_GCC_MK= defined
@@ -103,6 +103,9 @@ _NEED_GCC3?= no
_NEED_GCC3= yes
. endif
.endfor
+.if !empty(_NEED_GCC2:M[nN][oO]) && !empty(_NEED_GCC3:M[nN][oO])
+_NEED_GCC3= yes
+.endif
# Assume by default that GCC will only provide a C compiler.
LANGUAGES.gcc?= c