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
This commit is contained in:
Bryan Drewery
2015-09-17 17:35:06 +00:00
parent 399fbd0ec0
commit 232af7950c
+4 -3
View File
@@ -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