Date: Tue, 29 Nov 2011 08:20:23 +0000 (UTC) From: Max Khon <fjoe@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r228120 - head/share/mk Message-ID: <201111290820.pAT8KNRS030981@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111290820.pAT8KNRS030981>