From owner-svn-src-all@FreeBSD.ORG  Mon Aug  4 22:34:57 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6F103A19
 for <svn-src-all@freebsd.org>; Mon,  4 Aug 2014 22:34:57 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4588A2615
 for <svn-src-all@freebsd.org>; Mon,  4 Aug 2014 22:34:57 +0000 (UTC)
Received: from imp (uid 547) (envelope-from imp@FreeBSD.org) id 506c
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Mon, 04 Aug 2014 22:34:57 +0000
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 4 Aug 2014 22:34:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269539 - head/sys/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e00a91.506c.40f1d8f3@svn.freebsd.org>
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Aug 2014 22:34:57 -0000

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