From 9c8809d77f8386bc946bdb88ff959b26fbc74dad Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Tue, 21 Jun 2016 20:14:32 +0000 Subject: [PATCH] Fix top-level builds with fmake / 9.x. Reported by: allanjude Approved by: re (marius) Sponsored by: EMC / Isilon Storage Division --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 517bbcdf9f79..89e34f039a8d 100644 --- a/Makefile +++ b/Makefile @@ -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 .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