Author: brooks
Date: Sun Oct 21 09:31:48 2012
New Revision: 241799
URL: http://svn.freebsd.org/changeset/base/241799
Log:
MFC r228120:
Allow NO_FOO to override WITH_FOO that could be specified in /etc/src.conf.
This is required to override knobs (e.g. WITH_PROFILE) during buildworld
stages in Makefile.inc1 (otherwise the build is stopped due to both WITH_FOO
and WITHOUT_FOO defined).
PR: misc/172873
Modified:
stable/9/share/mk/bsd.own.mk
Directory Properties:
stable/9/share/mk/ (props changed)
Modified: stable/9/share/mk/bsd.own.mk
==============================================================================
--- stable/9/share/mk/bsd.own.mk Sun Oct 21 08:46:15 2012
(r241798)
+++ stable/9/share/mk/bsd.own.mk Sun Oct 21 09:31:48 2012
(r241799)
@@ -208,6 +208,13 @@ COMPRESS_EXT?= .gz
MAN \
PROFILE
.if defined(NO_${var})
+.if defined(WITH_${var})
+.warning unsetting WITH_${var}
+.undef WITH_${var}
+.if defined(WITH_${var})
+.error wtf
+.endif
+.endif
WITHOUT_${var}=
.endif
.endfor
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
