svn commit: r319592 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Mon Jun  5 05:17:36 2017
New Revision: 319592
URL: https://svnweb.freebsd.org/changeset/base/319592

Log:
  META_MODE: Allow not ignoring host headers with NO_META_IGNORE_HOST_HEADERS.
  
  See r301467 for more details on NO_META_IGNORE_HOST.  Usually the full
  list of host ignores should have no real impact on the host tools.  The
  headers however may reliably define what the ABI is for the host.  It
  may be useful to allow using the headers for the build but still not
  caring about things like /bin/sh, /lib/libedit.so, etc.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  head/share/mk/sys.mk

Modified: head/share/mk/sys.mk
==============================================================================
--- head/share/mk/sys.mk	Sun Jun  4 21:58:02 2017	(r319591)
+++ head/share/mk/sys.mk	Mon Jun  5 05:17:36 2017	(r319592)
@@ -70,7 +70,8 @@ META_MODE+= missing-filemon=yes
 META_MODE?= normal
 .export META_MODE
 .MAKE.MODE?= ${META_MODE}
-.if !empty(.MAKE.MODE:Mmeta) && !defined(NO_META_IGNORE_HOST)
+.if !empty(.MAKE.MODE:Mmeta)
+.if !defined(NO_META_IGNORE_HOST)
 # Ignore host file changes that will otherwise cause
 # buildworld -> installworld -> buildworld to rebuild everything.
 # Since the build is self-reliant and bootstraps everything it needs,
@@ -85,17 +86,20 @@ META_MODE?= normal
 	/rescue \
 	/sbin \
 	/usr/bin \
-	/usr/include \
 	/usr/lib \
 	/usr/sbin \
 	/usr/share \
 
+.else
+NO_META_IGNORE_HOST_HEADERS=	1
 .endif
-.if !empty(.MAKE.MODE:Mmeta)
+.if !defined(NO_META_IGNORE_HOST_HEADERS)
+.MAKE.META.IGNORE_PATHS+= /usr/include
+.endif
 # We do not want everything out-of-date just because
 # some unrelated shared lib updated this.
 .MAKE.META.IGNORE_PATHS+= /usr/local/etc/libmap.d
-.endif
+.endif	# !empty(.MAKE.MODE:Mmeta)
 
 .if ${MK_AUTO_OBJ} == "yes"
 # This needs to be done early - before .PATH is computed