Author: bdrewery Date: Thu May 19 22:53:44 2016 New Revision: 300243 URL: https://svnweb.freebsd.org/changeset/base/300243
Log: Follow-up r300233: Don't override MK_* from env as head does. PR: D6271 Sponsored by: EMC / Isilon Storage Division Modified: stable/10/share/mk/bsd.own.mk Modified: stable/10/share/mk/bsd.own.mk ============================================================================== --- stable/10/share/mk/bsd.own.mk Thu May 19 22:43:21 2016 (r300242) +++ stable/10/share/mk/bsd.own.mk Thu May 19 22:53:44 2016 (r300243) @@ -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 _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"