Author: fjoe
Date: Tue Nov 29 08:20:23 2011
New Revision: 228120
URL: http://svn.freebsd.org/changeset/base/228120
Log:
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).
Modified:
head/share/mk/bsd.own.mk
Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk Tue Nov 29 08:16:14 2011 (r228119)
+++ head/share/mk/bsd.own.mk Tue Nov 29 08:20:23 2011 (r228120)
@@ -207,6 +207,9 @@ COMPRESS_EXT?= .gz
MAN \
PROFILE
.if defined(NO_${var})
+.if defined(WITH_${var})
+.undef WITH_${var}
+.endif
WITHOUT_${var}=
.endif
.endfor
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
