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

Make sys.mk more compatible with fmake by refraining from using :U

Browse Source 
modifiers.

Differential Revision: https://reviews.freebsd.org/D3228
This commit is contained in:
Warner Losh 2015-08-27 02:59:48 +00:00
parent e0be2e9bc8
commit b9d0791f06
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=287187
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
share/mk/sys.mk
View File

@ -33,16 +33,23 @@ __DEFAULT_DEPENDENT_OPTIONS= \
# early include for customization
# see local.sys.mk below
.-include <local.sys.env.mk>
# Not included when building in fmake compatibility mode (still needed
# for older system support)
.if defined(.PARSEDIR)
.sinclude <local.sys.env.mk>
.if ${MK_META_MODE} == "yes"
.-include <meta.sys.mk>
.elif ${MK_META_FILES} == "yes" && ${.MAKEFLAGS:U:M-B} == ""
.sinclude <meta.sys.mk>
.elif ${MK_META_FILES} == "yes" && defined(.MAKEFLAGS)
.if ${.MAKEFLAGS:M-B} == ""
.MAKE.MODE= meta verbose
.endif
.endif
.if ${MK_AUTO_OBJ} == "yes"
# This needs to be done early - before .PATH is computed
.-include <auto.obj.mk>
.sinclude <auto.obj.mk>
.endif
.endif
# If the special target .POSIX appears (without prerequisites or
@ -362,7 +369,7 @@ __MAKE_CONF?=/etc/make.conf
.endif
# late include for customization
.-include <local.sys.mk>
.sinclude <local.sys.mk>
.if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
SHELL= ${__MAKE_SHELL}
@ -379,11 +386,12 @@ SHELL= ${__MAKE_SHELL}
# when running target scripts, this is a problem for many makefiles here.
# So define a shell that will do what FreeBSD expects.
.ifndef WITHOUT_SHELL_ERRCTL
__MAKE_SHELL?=/bin/sh
.SHELL: name=sh \
quiet="set -" echo="set -v" filter="set -" \
hasErrCtl=yes check="set -e" ignore="set +e" \
echoFlag=v errFlag=e \
path=${__MAKE_SHELL:U/bin/sh}
path=${__MAKE_SHELL}
.endif
.include <bsd.cpu.mk>