MFH

Sponsored by:	The FreeBSD Foundation

5 files changed, 22 insertions, 11 deletions

diff --git a/sys/conf/config.mk b/sys/conf/config.mk
index b95b781..433f420 100644
--- a/sys/conf/config.mk
+++ b/sys/conf/config.mk
@@ -49,6 +49,12 @@ KERN_OPTS+= INET6
 .if ${MK_EISA} != "no"
 KERN_OPTS+= DEV_EISA
 .endif
-.else
+.elif !defined(KERN_OPTS)
 KERN_OPTS!=cat ${KERNBUILDDIR}/opt*.h | awk '{print $$2;}' | sort -u
+.export KERN_OPTS
+.endif
+
+.if !defined(__MPATH)
+__MPATH!=find ${SYSDIR:tA}/ -name \*_if.m
+.export __MPATH
 .endif
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 085d78f..f561f8a 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -42,10 +42,9 @@ CLANG_NO_IAS34= -no-integrated-as
 .endif
 
 .if ${COMPILER_TYPE} == "gcc"
-.if ${COMPILER_VERSION} >= 40300
+.if ${COMPILER_VERSION} >= 40800
 # Catch-all for all the things that are in our tree, but for which we're
-# not yet ready for this compiler. Note: we likely only really "support"
-# building with gcc 4.8 and newer. Nothing older has been tested.
+# not yet ready for this compiler.
 CWARNEXTRA?=	-Wno-error=inline -Wno-error=enum-compare -Wno-error=unused-but-set-variable \
 		-Wno-error=aggressive-loop-optimizations -Wno-error=maybe-uninitialized \
 		-Wno-error=array-bounds -Wno-error=address \
diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
index a1906cf..d1d2d04 100644
--- a/sys/conf/kern.opts.mk
+++ b/sys/conf/kern.opts.mk
@@ -30,6 +30,7 @@ __DEFAULT_YES_OPTIONS = \
     CDDL \
     CRYPT \
     CUSE \
+    FAST_DEPEND \
     FORMAT_EXTENSIONS \
     INET \
     INET6 \
@@ -45,7 +46,6 @@ __DEFAULT_YES_OPTIONS = \
 
 __DEFAULT_NO_OPTIONS = \
     EISA \
-    FAST_DEPEND \
     NAND \
     OFED
 
@@ -144,7 +144,10 @@ MK_${var}:=	no
 MK_${var}_SUPPORT:= no
 .else
 .if defined(KERNBUILDDIR)	# See if there's an opt_foo.h
+.if !defined(OPT_${var})
 OPT_${var}!= cat ${KERNBUILDDIR}/opt_${var:tl}.h; echo
+.export OPT_${var}
+.endif
 .if ${OPT_${var}} == ""		# nothing -> no
 MK_${var}_SUPPORT:= no
 .else
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index ba2c792..d5047a8 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -231,7 +231,10 @@ _meta_filemon=	1
 .if ${MK_FAST_DEPEND} == "yes"
 DEPENDOBJS+=	${SYSTEM_OBJS} genassym.o
 DEPENDFILES_OBJS=	${DEPENDOBJS:O:u:C/^/.depend./}
-DEPEND_CFLAGS+=	-MD -MP -MF.depend.${.TARGET}
+.if ${MAKE_VERSION} < 20160220
+DEPEND_MP?=	-MP
+.endif
+DEPEND_CFLAGS+=	-MD ${DEPEND_MP} -MF.depend.${.TARGET}
 DEPEND_CFLAGS+=	-MT${.TARGET}
 .if !defined(_meta_filemon)
 .if defined(.PARSEDIR)
@@ -244,7 +247,11 @@ CFLAGS+=	${DEPEND_CFLAGS}
 .endif
 .if !defined(_SKIP_READ_DEPEND)
 .for __depend_obj in ${DEPENDFILES_OBJS}
+.if ${MAKE_VERSION} < 20160220
 .sinclude "${.OBJDIR}/${__depend_obj}"
+.else
+.dinclude "${.OBJDIR}/${__depend_obj}"
+.endif
 .endfor
 .endif	# !defined(_SKIP_READ_DEPEND)
 .endif	# !defined(_meta_filemon)
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 10b7ded..6a3e1eb 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -386,11 +386,7 @@ vnode_if_typedef.h:
 .endif
 
 # Build _if.[ch] from _if.m, and clean them when we're done.
-# This is duplicated in sys/modules/Makefile.
-.if !defined(__MPATH)
-__MPATH!=find ${SYSDIR:tA}/ -name \*_if.m
-.export __MPATH
-.endif
+# __MPATH defined in config.mk
 _MFILES=${__MPATH:T:O}
 _MPATH=${__MPATH:H:O:u}
 .PATH.m: ${_MPATH}