Author: brooks
Date: Tue Oct 23 21:20:05 2012
New Revision: 241969
URL: http://svn.freebsd.org/changeset/base/241969
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/8/share/mk/bsd.own.mk
Directory Properties:
stable/8/share/mk/ (props changed)
Modified: stable/8/share/mk/bsd.own.mk
==============================================================================
--- stable/8/share/mk/bsd.own.mk Tue Oct 23 20:29:50 2012
(r241968)
+++ stable/8/share/mk/bsd.own.mk Tue Oct 23 21:20:05 2012
(r241969)
@@ -208,6 +208,9 @@ COMPRESS_EXT?= .gz
MAN \
PROFILE
.if defined(NO_${var})
+.if defined(WITH_${var})
+.undef WITH_${var}
+.endif
WITHOUT_${var}=
.endif
.endfor
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
