Author: bdrewery
Date: Tue Jun 21 20:14:32 2016
New Revision: 302067
URL: https://svnweb.freebsd.org/changeset/base/302067
Log:
Fix top-level builds with fmake / 9.x.
Reported by: allanjude
Approved by: re (marius)
Sponsored by: EMC / Isilon Storage Division
Modified:
head/Makefile
Modified: head/Makefile
==============================================================================
--- head/Makefile Tue Jun 21 20:13:19 2016 (r302066)
+++ head/Makefile Tue Jun 21 20:14:32 2016 (r302067)
@@ -103,7 +103,7 @@
# This is included so CC is set to ccache for -V, and COMPILER_TYPE/VERSION
# can be cached for sub-makes.
-.if ${MAKE_VERSION} >= 20140620
+.if ${MAKE_VERSION} >= 20140620 && defined(.PARSEDIR)
.include <bsd.compiler.mk>
.endif
@@ -218,7 +218,9 @@ _CAN_USE_META_MODE?= yes
.endfor
.if !defined(_CAN_USE_META_MODE)
_MAKE+= MK_META_MODE=no
+.if defined(.PARSEDIR)
.unexport META_MODE
+.endif
.elif defined(MK_META_MODE) && ${MK_META_MODE} == "yes"
.if !exists(/dev/filemon) && !defined(NO_FILEMON) && !make(showconfig)
# Require filemon be loaded to provide a working incremental build
_______________________________________________
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"
