diff options
| author | fjoe <fjoe@FreeBSD.org> | 2011-11-29 08:20:23 +0000 |
|---|---|---|
| committer | fjoe <fjoe@FreeBSD.org> | 2011-11-29 08:20:23 +0000 |
| commit | c986ef0cb9b8419ddca540949fcba800d44dcccc (patch) | |
| tree | ecc5699c453ffd728ba194ad5191213339ab7644 /share/mk | |
| parent | b050d953ee0f6fb7e2303645b5089b4e0b456f0c (diff) | |
| download | FreeBSD-src-c986ef0cb9b8419ddca540949fcba800d44dcccc.zip FreeBSD-src-c986ef0cb9b8419ddca540949fcba800d44dcccc.tar.gz | |
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).
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.own.mk | 3 |
1 files changed, 3 insertions, 0 deletions
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 |
