Date: Thu, 17 Sep 2015 17:35:07 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287924 - head/share/mk Message-ID: <201509171735.t8HHZ7uj011875@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Sep 17 17:35:06 2015 New Revision: 287924 URL: https://svnweb.freebsd.org/changeset/base/287924 Log: Include bsd.mkopt.mk after local.sys.env.mk (which includes /etc/src-env.conf). This will allow setting WITH_META_MODE in that file rather that requiring it to be set in the environment. Sponsored by: EMC / Isilon Storage Division Modified: head/share/mk/sys.mk Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Thu Sep 17 17:27:49 2015 (r287923) +++ head/share/mk/sys.mk Thu Sep 17 17:35:06 2015 (r287924) @@ -29,8 +29,6 @@ __DEFAULT_DEPENDENT_OPTIONS= \ STAGING/META_MODE \ SYSROOT/META_MODE -.include <bsd.mkopt.mk> - # early include for customization # see local.sys.mk below # Not included when building in fmake compatibility mode (still needed @@ -38,6 +36,8 @@ __DEFAULT_DEPENDENT_OPTIONS= \ .if defined(.PARSEDIR) .sinclude <local.sys.env.mk> +.include <bsd.mkopt.mk> + .if ${MK_META_MODE} == "yes" .sinclude <meta.sys.mk> .elif ${MK_META_FILES} == "yes" && defined(.MAKEFLAGS) @@ -52,7 +52,8 @@ __DEFAULT_DEPENDENT_OPTIONS= \ .sinclude <auto.obj.mk> .endif .endif - +.else # bmake +.include <bsd.mkopt.mk> .endif # If the special target .POSIX appears (without prerequisites or
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509171735.t8HHZ7uj011875>