diff options
author | bdrewery <bdrewery@FreeBSD.org> | 2016-01-07 00:20:47 +0000 |
---|---|---|
committer | bdrewery <bdrewery@FreeBSD.org> | 2016-01-07 00:20:47 +0000 |
commit | 14f143093d5a3e4956d20af0c4aeda49f9b4aea6 (patch) | |
tree | 138de4a62308a231e9a473f365007b9ba8a6c145 /share/mk | |
parent | 0e634907c1421239606d5cfe5ba99f6e8298d900 (diff) | |
download | FreeBSD-src-14f143093d5a3e4956d20af0c4aeda49f9b4aea6.zip FreeBSD-src-14f143093d5a3e4956d20af0c4aeda49f9b4aea6.tar.gz |
Revert r293286. It was not intended to come in yet.
Diffstat (limited to 'share/mk')
-rw-r--r-- | share/mk/sys.mk | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/share/mk/sys.mk b/share/mk/sys.mk index d8fc057..51f2818 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -33,13 +33,6 @@ __ENV_ONLY_OPTIONS:= \ ${__DEFAULT_YES_OPTIONS} \ ${__DEFAULT_DEPENDENT_OPTIONS:H} -__ENV_ONLY_VARS= \ - MAKEOBJDIR \ - MAKEOBJDIRPREFIX -.for _var in ${__ENV_ONLY_VARS} -_pre_includes_${_var:tl}:= ${${_var}:U__null} -.endfor - # early include for customization # see local.sys.mk below # Not included when building in fmake compatibility mode (still needed @@ -57,9 +50,6 @@ _pre_includes_${_var:tl}:= ${${_var}:U__null} .endif .endif .if ${MK_AUTO_OBJ} == "yes" -# Reset, since it is allowed to be set from src-env.conf included before this. -_pre_includes_makeobjdirprefix:= ${MAKEOBJDIRPREFIX:U__null} -_pre_includes_makeobjdir:= ${MAKEOBJDIR:U__null} # This needs to be done early - before .PATH is computed # Don't do this for 'make showconfig' as it enables all options where meta mode # is not expected. @@ -420,15 +410,6 @@ __MAKE_SHELL?=/bin/sh path=${__MAKE_SHELL} .endif -# Ensure MAKEOBJDIRPREFIX was not incorrectly set. -.for _var in ${__ENV_ONLY_VARS} -.if ${.MAKEOVERRIDES:M${_var}} || (defined(${_var}) && \ - ${${_var}} != ${_pre_includes_${_var:tl}}) -.error ${_var} can only be set in environment, not as a global (in make.conf(5)) or command-line variable. -.endif -.undef _pre_includes_${_var:tl} -.endfor - # Hack for ports compatibility. Historically, ports makefiles have # assumed they can examine MACHINE_CPU without including anything # because this was automatically included in sys.mk. For /usr/src, |