D23699.id68412.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D23699.id68412.diff
View Options

	Index: head/sys/modules/Makefile
	===================================================================
	--- head/sys/modules/Makefile
	+++ head/sys/modules/Makefile
	@@ -8,6 +8,8 @@
	# Modules that include binary-only blobs of microcode should be selectable by
	# MK_SOURCELESS_UCODE option (see below).

	+.include "${SYSDIR}/conf/config.mk"
	+
	.if defined(MODULES_OVERRIDE) && !defined(ALL_MODULES)
	SUBDIR=${MODULES_OVERRIDE}
	.else
	@@ -396,8 +398,10 @@
	.if ${MK_CDDL} != "no" \|\| defined(ALL_MODULES)
	.if (${MACHINE_CPUARCH} != "arm" \|\| ${MACHINE_ARCH:Marmv[67]*} != "") && \
	${MACHINE_CPUARCH} != "mips"
	+.if ${KERN_OPTS:MKDTRACE_HOOKS}
	SUBDIR+= dtrace
	.endif
	+.endif
	SUBDIR+= opensolaris
	.endif

	@@ -712,9 +716,11 @@
	_smartpqi= smartpqi

	.if ${MK_BHYVE} != "no" \|\| defined(ALL_MODULES)
	+.if ${KERN_OPTS:MSMP}
	_vmm= vmm
	.endif
	.endif
	+.endif

	.if ${MACHINE_CPUARCH} == "i386"
	# XXX some of these can move to the general case when de-i386'ed
	@@ -798,8 +804,6 @@
	${KLDXREF_CMD} ${DESTDIR}${KMODDIR}; \
	fi
	.endif
	-
	-.include "${SYSDIR}/conf/config.mk"

	SUBDIR:= ${SUBDIR:u:O}