diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-05 03:37:47 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-05 03:37:47 +0000 |
| commit | 629be8a499229a01bf5edb46711dd7b72a95a958 (patch) | |
| tree | 63c95ead370135a22f52871833bd628fc5529650 /mk/bsd.pkg.mk | |
| parent | c2d20bedad498d2bf5cda3907503947cbece550a (diff) | |
| download | pkgsrc-629be8a499229a01bf5edb46711dd7b72a95a958.tar.gz | |
Include bsd.compiler.mk inside both bsd.pkg.mk and bsd.prefs.mk and define
a stack-like mechanism in bsd.prefs.mk to detect when a we're inside
bsd.prefs.mk.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 609cd01e64c..57497928e04 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1369 2004/02/02 11:34:17 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1370 2004/02/05 03:37:47 jlam Exp $ # # This file is in the public domain. # @@ -1319,10 +1319,14 @@ SCRIPTS_ENV+= CURDIR=${.CURDIR} DISTDIR=${DISTDIR} \ SCRIPTS_ENV+= BATCH=yes .endif +# Get the proper dependencies and set the PATH to use the compiler +# named in PKGSRC_COMPILER. +# +.include "../../mk/compiler/bsd.compiler.mk" + .if !empty(USE_BUILDLINK2:M[nN][oO]) && !empty(USE_BUILDLINK3:M[nN][oO]) NO_BUILDLINK= # defined .endif - .if !defined(NO_BUILDLINK) . if empty(USE_BUILDLINK3:M[nN][oO]) . include "../../mk/buildlink3/bsd.buildlink3.mk" |