svn commit: r269539 - head/sys/conf

[Warner Losh]

Author: imp
Date: Mon Aug  4 22:34:56 2014
New Revision: 269539
URL: http://svnweb.freebsd.org/changeset/base/269539

Log:
  Include the kernel options after bsd.init.mk so that when we're
  compiling on older systems that define all the MK variables in
  bsd.own.mk we don't get the multiply defined error for options that
  live in both.

Modified:
  head/sys/conf/kmod.mk

Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk	Mon Aug  4 22:34:12 2014	(r269538)
+++ head/sys/conf/kmod.mk	Mon Aug  4 22:34:56 2014	(r269539)
@@ -65,9 +65,10 @@ KMODLOAD?=	/sbin/kldload
 KMODUNLOAD?=	/sbin/kldunload
 OBJCOPY?=	objcopy
 
-# Grab all the options for a kernel build.
-.include "kern.opts.mk"
 .include <bsd.init.mk>
+# Grab all the options for a kernel build. For backwards compat, we need to
+# do this after bsd.own.mk.
+.include "kern.opts.mk"
 .include <bsd.compiler.mk>
 
 .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S