Fix top-level builds with fmake / 9.x.
Reported by: allanjude Approved by: re (marius) Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
parent
45cd4c8cef
commit
9c8809d77f
4
Makefile
4
Makefile
@ -103,7 +103,7 @@
|
|||||||
|
|
||||||
# This is included so CC is set to ccache for -V, and COMPILER_TYPE/VERSION
|
# This is included so CC is set to ccache for -V, and COMPILER_TYPE/VERSION
|
||||||
# can be cached for sub-makes.
|
# can be cached for sub-makes.
|
||||||
.if ${MAKE_VERSION} >= 20140620
|
.if ${MAKE_VERSION} >= 20140620 && defined(.PARSEDIR)
|
||||||
.include <bsd.compiler.mk>
|
.include <bsd.compiler.mk>
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
@ -218,7 +218,9 @@ _CAN_USE_META_MODE?= yes
|
|||||||
.endfor
|
.endfor
|
||||||
.if !defined(_CAN_USE_META_MODE)
|
.if !defined(_CAN_USE_META_MODE)
|
||||||
_MAKE+= MK_META_MODE=no
|
_MAKE+= MK_META_MODE=no
|
||||||
|
.if defined(.PARSEDIR)
|
||||||
.unexport META_MODE
|
.unexport META_MODE
|
||||||
|
.endif
|
||||||
.elif defined(MK_META_MODE) && ${MK_META_MODE} == "yes"
|
.elif defined(MK_META_MODE) && ${MK_META_MODE} == "yes"
|
||||||
.if !exists(/dev/filemon) && !defined(NO_FILEMON) && !make(showconfig)
|
.if !exists(/dev/filemon) && !defined(NO_FILEMON) && !make(showconfig)
|
||||||
# Require filemon be loaded to provide a working incremental build
|
# Require filemon be loaded to provide a working incremental build
|
||||||
|
Loading…
x
Reference in New Issue
Block a user