diff options
| author | imp <imp@FreeBSD.org> | 2015-12-11 05:39:44 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2015-12-11 05:39:44 +0000 |
| commit | 50899ae1223da0a12572256f0c01bb0c6df61047 (patch) | |
| tree | 51c9091ede3f2217af8e3047fb17c5f56a5515dd /share | |
| parent | 11bf55809abcb6efe0c435221b21dbf9d1a7206d (diff) | |
| download | FreeBSD-src-50899ae1223da0a12572256f0c01bb0c6df61047.zip FreeBSD-src-50899ae1223da0a12572256f0c01bb0c6df61047.tar.gz | |
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
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.opts.mk | 2 | ||||
| -rw-r--r-- | share/mk/sys.mk | 9 |
2 files changed, 11 insertions, 0 deletions
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 diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 68d2db3..632c116 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -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 |
