From 39ac22cb40a257b1ba0a9aaa243085bd42a558ad Mon Sep 17 00:00:00 2001 From: bdrewery Date: Tue, 1 Dec 2015 20:56:16 +0000 Subject: [PATCH] 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 --- share/mk/src.sys.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/mk/src.sys.mk b/share/mk/src.sys.mk index 7b84d5149316..6c1ebb753f55 100644 --- a/share/mk/src.sys.mk +++ b/share/mk/src.sys.mk @@ -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-}${WITHOUT_${var}:Uno:Dyes}${WITH_${var}:Uno .endfor .endif # SRCCONF +.endif # tempting, but bsd.compiler.mk causes problems this early # probably need to remove dependence on bsd.own.mk