From 8609cb7bfde2ea7318c1be85a48532377a4b6afd Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 24 Apr 2014 02:02:51 +0000
Subject: [PATCH] Include bsd.opts.mk before Makefile.inc so Makefile.inc can
 do things based on MK_xxx symbols. Continue to include bsd.own.mk after
 Makefile.inc to preserve current behavior.

---
 share/mk/bsd.init.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/share/mk/bsd.init.mk b/share/mk/bsd.init.mk
index f5f4c66cfff..59ed4002641 100644
--- a/share/mk/bsd.init.mk
+++ b/share/mk/bsd.init.mk
@@ -1,11 +1,14 @@
 # $FreeBSD$
 
-# The include file <bsd.init.mk> includes ../Makefile.inc and
-# <bsd.own.mk>; this is used at the top of all <bsd.*.mk> files
-# that actually "build something".
+# The include file <bsd.init.mk> includes <bsd.opts.mk>,
+# ../Makefile.inc and <bsd.own.mk>; this is used at the
+# top of all <bsd.*.mk> files that actually "build something".
+# bsd.opts.mk is included early so Makefile.inc can use the
+# MK_FOO variables.
 
 .if !target(__<bsd.init.mk>__)
 __<bsd.init.mk>__:
+.include <bsd.opts.mk>
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif