Author: bdrewery
Date: Tue Dec 1 20:56:16 2015
New Revision: 291613
URL: https://svnweb.freebsd.org/changeset/base/291613
Log:
Only include src.conf if _WITHOUT_SRCCONF not defined.
This does not really fix anything currently since _WITHOUT_SRCCONF must be
defined in the environment or local.sys.*.mk, but is proper and needed for
downstream fixes. I am working towards reworking src.conf inclusion still.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/mk/src.sys.mk
Modified: head/share/mk/src.sys.mk
==============================================================================
--- head/share/mk/src.sys.mk Tue Dec 1 20:50:14 2015 (r291612)
+++ head/share/mk/src.sys.mk Tue Dec 1 20:56:16 2015 (r291613)
@@ -5,6 +5,7 @@
# to preserve historical (and useful) behavior. Changes here need to
# be reflected there so SRCCONF isn't included multiple times.
+.if !defined(_WITHOUT_SRCCONF)
# Allow user to configure things that only effect src tree builds.
SRCCONF?= /etc/src.conf
.if (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") &&
!target(_srcconf_included_)
@@ -29,6 +30,7 @@ __postrcconf_${var}:= ${MK_${var}:U-}${W
.endfor
.endif # SRCCONF
+.endif
# tempting, but bsd.compiler.mk causes problems this early
# probably need to remove dependence on bsd.own.mk
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
