diff options
| author | gavan <gavan@pkgsrc.org> | 2003-08-21 16:16:46 +0000 |
|---|---|---|
| committer | gavan <gavan@pkgsrc.org> | 2003-08-21 16:16:46 +0000 |
| commit | 58bef710d68174634eaf451ad5c761ae92a40d96 (patch) | |
| tree | 593d856b9b16560e18dbccd6a03cc21d5aa5e3b2 /mk | |
| parent | 4de3840eec36522739f84a16fab1471f70436ee4 (diff) | |
| download | pkgsrc-58bef710d68174634eaf451ad5c761ae92a40d96.tar.gz | |
Avoid circular dependency on gcc if USE_GCC[23] is set.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 4 | ||||
| -rw-r--r-- | 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 |