From e3ecce1cb980bd3fad0520ff039fee9f69f6b755 Mon Sep 17 00:00:00 2001
From: gavan <gavan>
Date: Thu, 21 Aug 2003 16:16:46 +0000
Subject: Avoid circular dependency on gcc if USE_GCC[23] is set.

---
 mk/bsd.prefs.mk      | 4 +++-
 mk/gcc.buildlink2.mk | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index a3aa1bf0036..d755a470d13 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.119 2003/08/16 08:39:17 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.120 2003/08/21 16:16:46 gavan Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -309,6 +309,8 @@ SCRIPTDIR?=		${.CURDIR}/scripts
 FILESDIR?=		${.CURDIR}/files
 PKGDIR?=		${.CURDIR}
 
+_PKGSRC_DEPS?=		# empty
+
 # If WRKOBJDIR is set, use that tree to build
 .if defined(WRKOBJDIR)
 BUILD_DIR?=		${WRKOBJDIR}/${PKGPATH}
diff --git a/mk/gcc.buildlink2.mk b/mk/gcc.buildlink2.mk
index e65c13b02bc..70266922570 100644
--- a/mk/gcc.buildlink2.mk
+++ b/mk/gcc.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.buildlink2.mk,v 1.4 2003/07/22 01:00:25 kristerw Exp $
+# $NetBSD: gcc.buildlink2.mk,v 1.5 2003/08/21 16:16:46 gavan Exp $
 #
 # USE_GCC2
 #	If defined, use gcc from lang/gcc.
@@ -11,9 +11,9 @@ GCC_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(USE_GCC3) && empty(PKGPATH:Mlang/gcc3)
+.if defined(USE_GCC3) && empty(PKGPATH:Mlang/gcc3) && empty(_PKGSRC_DEPS:Mgcc-3.*)
 .  include "../lang/gcc3/buildlink2.mk"
-.elif defined(USE_GCC2) && empty(PKGPATH:Mlang/gcc)
+.elif defined(USE_GCC2) && empty(PKGPATH:Mlang/gcc) && empty(_PKGSRC_DEPS:Mgcc-2.*)
 .  include "../lang/gcc/buildlink2.mk"
 .endif
 
-- 
cgit v1.2.3