diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-05-19 22:53:44 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-05-19 22:53:44 +0000 |
| commit | ece50e187dd29d2c45ed70d648a13fd05a563b10 (patch) | |
| tree | 0b8bae49bbb7aa20339c48acb5f9d972a2d22e45 /share/mk | |
| parent | 710243b221d01c9bbcf0afc6a447ec178c3a39f9 (diff) | |
| download | FreeBSD-src-ece50e187dd29d2c45ed70d648a13fd05a563b10.zip FreeBSD-src-ece50e187dd29d2c45ed70d648a13fd05a563b10.tar.gz | |
Follow-up r300233: Don't override MK_* from env as head does.
PR: D6271
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.own.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 699a106..6f0fd3e 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -480,6 +480,7 @@ __DEFAULT_NO_OPTIONS+=HYPERV # MK_* options which default to "yes". # .for var in ${__DEFAULT_YES_OPTIONS} +.if !defined(MK_${var}) .if defined(WITH_${var}) && defined(WITHOUT_${var}) .error WITH_${var} and WITHOUT_${var} can't both be set. .endif @@ -488,6 +489,7 @@ MK_${var}:= no .else MK_${var}:= yes .endif +.endif # !defined(MK_${var}) .endfor .undef __DEFAULT_YES_OPTIONS @@ -495,6 +497,7 @@ MK_${var}:= yes # MK_* options which default to "no". # .for var in ${__DEFAULT_NO_OPTIONS} +.if !defined(MK_${var}) .if defined(WITH_${var}) && defined(WITHOUT_${var}) .error WITH_${var} and WITHOUT_${var} can't both be set. .endif @@ -503,6 +506,7 @@ MK_${var}:= yes .else MK_${var}:= no .endif +.endif # !defined(MK_${var}) .endfor .undef __DEFAULT_NO_OPTIONS |
