D4383.id.diff
No OneTemporary
Actions

Size

977 B

Referenced Files

None

Subscribers

None

D4383.id.diff
View Options

	Index: share/mk/bsd.opts.mk
	===================================================================
	--- share/mk/bsd.opts.mk
	+++ share/mk/bsd.opts.mk
	@@ -104,6 +104,8 @@
	MK_STALE_STAGED= no
	.endif

	+.include <bsd.cpu.mk>
	+
	.endif # !_WITHOUT_SRCCONF

	.endif
	Index: share/mk/sys.mk
	===================================================================
	--- share/mk/sys.mk
	+++ share/mk/sys.mk
	@@ -406,6 +406,15 @@
	path=${__MAKE_SHELL}
	.endif

	+# Hack for ports compatibility. Historically, ports makefiles have
	+# assumed hey can examine MACHINE_CPU without including anything
	+# because this was automatically included in sys.mk. For /usr/src,
	+# this file has moved to being included from bsd.opts.mk. Until all
	+# the ports files are modernized, and a reasonable transitition
	+# period has passed, include it while we're in a ports tree here
	+# to preserve historic behavior.
	+.if exists(${.CURDIR}/../../Mk/bsd.port.mk)
	.include <bsd.cpu.mk>
	+.endif

	.endif # ! Posix