From c986ef0cb9b8419ddca540949fcba800d44dcccc Mon Sep 17 00:00:00 2001
From: fjoe <fjoe@FreeBSD.org>
Date: Tue, 29 Nov 2011 08:20:23 +0000
Subject: 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).
---
 share/mk/bsd.own.mk | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'share/mk')

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index e0afdf4..82ccefc 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -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
-- 
cgit v1.1