diff options
| author | imp <imp@FreeBSD.org> | 2014-05-17 20:31:34 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2014-05-17 20:31:34 +0000 |
| commit | 80aea54bcdd8dad250c9963f7c760adbe9f11a69 (patch) | |
| tree | c37d7b962b49eb0da0bafa254201e397fc764eac /share | |
| parent | 5f51b799679dcecb11b7c68d0d78a0782fabe502 (diff) | |
| download | FreeBSD-src-80aea54bcdd8dad250c9963f7c760adbe9f11a69.zip FreeBSD-src-80aea54bcdd8dad250c9963f7c760adbe9f11a69.tar.gz | |
The time is not yet ripe to break the lack of dependencies between
src/sys and the rest of the tree for builds.
o eliminate including bsd.mkopts.mk for the moment in kern.opts.mk
o No need to include src.opts.mk at all anymore. The reasons for it
are now coverted in sys.mk and src.sys.mk.
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/src.sys.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/share/mk/src.sys.mk b/share/mk/src.sys.mk index 39ed4c8..03aefc4 100644 --- a/share/mk/src.sys.mk +++ b/share/mk/src.sys.mk @@ -1,7 +1,13 @@ # $FreeBSD$ +# Note: This file is also duplicated in the sys/conf/kern.pre.mk so +# it will always grab SRCCONF, even if it isn't being built in-tree +# to preserve historical (and useful) behavior. Changes here need to +# be reflected there so SRCCONF isn't included multiple times. + # Allow user to configure things that only effect src tree builds. SRCCONF?= /etc/src.conf -.if exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf" +.if (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && !target(_srcconf_included_) .include "${SRCCONF}" +_srcconf_included_: .endif |
