From 50899ae1223da0a12572256f0c01bb0c6df61047 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Fri, 11 Dec 2015 05:39:44 +0000
Subject: Move the inclusion of bsd.cpu.mk from sys.mk to bsd.opts.mk. However,
 for historical behavior that ports depends on, include it if we're inside the
 ports tree.

Differential Review: https://reviews.freebsd.org/D4383
Ports Exp run: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=205021
---
 share/mk/bsd.opts.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'share/mk/bsd.opts.mk')

diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
index 3c27322..e2c56ac 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -104,6 +104,8 @@ MK_${var}:=no
 MK_STALE_STAGED= no
 .endif
 
+.include <bsd.cpu.mk>
+
 .endif # !_WITHOUT_SRCCONF
 
 .endif
-- 
cgit v1.1