Author: bdrewery
Date: Sat May 21 01:31:54 2016
New Revision: 300345
URL: https://svnweb.freebsd.org/changeset/base/300345
Log:
WITH_META_MODE: Disable for 'make install' from top-level.
See r298220 for more explanation. We don't want to prevent installing
if a cookie exists for the install target.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/mk/src.sys.env.mk
Modified: head/share/mk/src.sys.env.mk
==============================================================================
--- head/share/mk/src.sys.env.mk Sat May 21 01:31:51 2016
(r300344)
+++ head/share/mk/src.sys.env.mk Sat May 21 01:31:54 2016
(r300345)
@@ -18,6 +18,13 @@ SRC_ENV_CONF?= /etc/src-env.conf
_src_env_conf_included_: .NOTMAIN
.endif
+# Top-level installs should not use meta mode as it may prevent installing
+# based on cookies.
+.if make(*install*) && ${.MAKE.LEVEL} == 0
+META_MODE= normal
+MK_META_MODE= no
+.endif
+
# If we were found via .../share/mk we need to replace that
# with ${.PARSEDIR:tA} so that we can be found by
# sub-makes launched from objdir.
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
