Date: Fri, 11 Dec 2015 05:39:44 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r292084 - head/share/mk Message-ID: <201512110539.tBB5ditl017974@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Fri Dec 11 05:39:44 2015 New Revision: 292084 URL: https://svnweb.freebsd.org/changeset/base/292084 Log: 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 Modified: head/share/mk/bsd.opts.mk head/share/mk/sys.mk Modified: head/share/mk/bsd.opts.mk ============================================================================== --- head/share/mk/bsd.opts.mk Fri Dec 11 05:39:43 2015 (r292083) +++ head/share/mk/bsd.opts.mk Fri Dec 11 05:39:44 2015 (r292084) @@ -104,6 +104,8 @@ MK_${var}:=no MK_STALE_STAGED= no .endif +.include <bsd.cpu.mk> + .endif # !_WITHOUT_SRCCONF .endif Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Fri Dec 11 05:39:43 2015 (r292083) +++ head/share/mk/sys.mk Fri Dec 11 05:39:44 2015 (r292084) @@ -406,6 +406,15 @@ __MAKE_SHELL?=/bin/sh 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512110539.tBB5ditl017974>