diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-06-21 20:14:32 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-06-21 20:14:32 +0000 |
| commit | 9c8809d77f8386bc946bdb88ff959b26fbc74dad (patch) | |
| tree | 430b5ececa46d84a45c3ac9545cb8d1bddd9ee5c /Makefile | |
| parent | 45cd4c8cef14c81724f387461a16f31aaad5df75 (diff) | |
| download | src-test2-9c8809d77f8386bc946bdb88ff959b26fbc74dad.tar.gz src-test2-9c8809d77f8386bc946bdb88ff959b26fbc74dad.zip | |
Fix top-level builds with fmake / 9.x.
Reported by: allanjude
Approved by: re (marius)
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=302067
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 |