d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the inclusion of bsd.cpu.mk from sys.mk to bsd.opts.mk. However,

Browse Source 
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
This commit is contained in:
Warner Losh 2015-12-11 05:39:44 +00:00
parent 086ad4aa32
commit 9ca5434380
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/mk/bsd.opts.mk
View File

@ -104,6 +104,8 @@ MK_${var}:=no
MK_STALE_STAGED= no
.endif
.include <bsd.cpu.mk>
.endif # !_WITHOUT_SRCCONF
.endif

9
share/mk/sys.mk
View File

@ -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